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

package/src/adminClient.ts

@@ -61,7 +61,9 @@ export class AdminClient extends DriftClient {
 
 		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: SYSVAR_RENT_PUBKEY,
@@ -104,7 +106,6 @@ export class AdminClient extends DriftClient {
 		const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
 
 		const initializeIx = await this.getInitializeSpotMarketIx(
-			this.wallet.publicKey,
 			mint,
 			optimalUtilization,
 			optimalRate,
@@ -145,7 +146,6 @@ export class AdminClient extends DriftClient {
 	}
 
 	public async getInitializeSpotMarketIx(
-		admin: PublicKey,
 		mint: PublicKey,
 		optimalUtilization: number,
 		optimalRate: number,
@@ -207,7 +207,9 @@ export class AdminClient extends DriftClient {
 			nameBuffer,
 			{
 				accounts: {
-					admin,
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
 					spotMarket,
 					spotMarketVault,
@@ -231,7 +233,6 @@ export class AdminClient extends DriftClient {
 		serumProgram: PublicKey
 	): Promise<TransactionSignature> {
 		const initializeIx = await this.getInitializeSerumFulfillmentConfigIx(
-			this.wallet.publicKey,
 			marketIndex,
 			serumMarket,
 			serumProgram
@@ -245,7 +246,6 @@ export class AdminClient extends DriftClient {
 	}
 
 	public async getInitializeSerumFulfillmentConfigIx(
-		admin: PublicKey,
 		marketIndex: number,
 		serumMarket: PublicKey,
 		serumProgram: PublicKey
@@ -264,7 +264,9 @@ export class AdminClient extends DriftClient {
 			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,
@@ -285,7 +287,6 @@ export class AdminClient extends DriftClient {
 		phoenixMarket: PublicKey
 	): Promise<TransactionSignature> {
 		const initializeIx = await this.getInitializePhoenixFulfillmentConfigIx(
-			this.wallet.publicKey,
 			marketIndex,
 			phoenixMarket
 		);
@@ -298,7 +299,6 @@ export class AdminClient extends DriftClient {
 	}
 
 	public async getInitializePhoenixFulfillmentConfigIx(
-		admin: PublicKey,
 		marketIndex: number,
 		phoenixMarket: PublicKey
 	): Promise<TransactionInstruction> {
@@ -311,7 +311,9 @@ export class AdminClient extends DriftClient {
 			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,
@@ -334,6 +336,7 @@ export class AdminClient extends DriftClient {
 		periodicity: BN,
 		pegMultiplier: BN = PEG_PRECISION,
 		oracleSource: OracleSource = OracleSource.PYTH,
+		contractTier: ContractTier = ContractTier.SPECULATIVE,
 		marginRatioInitial = 2000,
 		marginRatioMaintenance = 500,
 		liquidatorFee = 0,
@@ -356,7 +359,6 @@ export class AdminClient extends DriftClient {
 		const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
 
 		const initializeMarketIx = await this.getInitializePerpMarketIx(
-			this.wallet.publicKey,
 			marketIndex,
 			priceOracle,
 			baseAssetReserve,
@@ -364,6 +366,7 @@ export class AdminClient extends DriftClient {
 			periodicity,
 			pegMultiplier,
 			oracleSource,
+			contractTier,
 			marginRatioInitial,
 			marginRatioMaintenance,
 			liquidatorFee,
@@ -402,7 +405,6 @@ export class AdminClient extends DriftClient {
 	}
 
 	public async getInitializePerpMarketIx(
-		admin: PublicKey,
 		marketIndex: number,
 		priceOracle: PublicKey,
 		baseAssetReserve: BN,
@@ -410,6 +412,7 @@ export class AdminClient extends DriftClient {
 		periodicity: BN,
 		pegMultiplier: BN = PEG_PRECISION,
 		oracleSource: OracleSource = OracleSource.PYTH,
+		contractTier: ContractTier = ContractTier.SPECULATIVE,
 		marginRatioInitial = 2000,
 		marginRatioMaintenance = 500,
 		liquidatorFee = 0,
@@ -443,6 +446,7 @@ export class AdminClient extends DriftClient {
 			periodicity,
 			pegMultiplier,
 			oracleSource,
+			contractTier,
 			marginRatioInitial,
 			marginRatioMaintenance,
 			liquidatorFee,
@@ -464,7 +468,9 @@ export class AdminClient extends DriftClient {
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
-					admin,
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
 					oracle: priceOracle,
 					perpMarket: perpMarketPublicKey,
 					rent: SYSVAR_RENT_PUBKEY,
@@ -486,7 +492,9 @@ export class AdminClient extends DriftClient {
 			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,
 				},
 			});
@@ -520,7 +528,9 @@ export class AdminClient extends DriftClient {
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
-					admin: this.wallet.publicKey,
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
 					perpMarket: marketPublicKey,
 				},
 			}
@@ -540,7 +550,9 @@ export class AdminClient extends 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 getPerpMarketPublicKey(
 					this.program.programId,
 					perpMarketIndex
@@ -573,7 +585,9 @@ export class AdminClient extends DriftClient {
 				{
 					accounts: {
 						state: await this.getStatePublicKey(),
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						perpMarket: marketPublicKey,
 					},
 				}
@@ -596,7 +610,9 @@ export class AdminClient extends DriftClient {
 				{
 					accounts: {
 						state: await this.getStatePublicKey(),
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
 							perpMarketIndex
@@ -646,7 +662,9 @@ export class AdminClient extends DriftClient {
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
-					admin: this.wallet.publicKey,
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
 					perpMarket: perpMarketPublicKey,
 				},
 			}
@@ -674,7 +692,9 @@ export class AdminClient extends DriftClient {
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
-					admin: this.wallet.publicKey,
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
 					oracle: ammData.oracle,
 					perpMarket: perpMarketPublicKey,
 				},
@@ -701,7 +721,9 @@ export class AdminClient extends DriftClient {
 			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,
 				},
@@ -727,7 +749,9 @@ export class AdminClient extends DriftClient {
 			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,
 				},
@@ -750,7 +774,9 @@ export class AdminClient extends DriftClient {
 		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 getPerpMarketPublicKey(
 						this.program.programId,
@@ -774,7 +800,9 @@ export class AdminClient extends DriftClient {
 	public async updateAdmin(admin: PublicKey): Promise<TransactionSignature> {
 		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(),
 			},
 		});
@@ -798,7 +826,9 @@ export class AdminClient extends DriftClient {
 				curveUpdateIntensity,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -826,7 +856,9 @@ export class AdminClient extends DriftClient {
 				targetBaseAssetAmountPerLP,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -856,7 +888,9 @@ export class AdminClient extends DriftClient {
 				marginRatioMaintenance,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -884,7 +918,9 @@ export class AdminClient extends DriftClient {
 				unrealizedPnlImfFactor,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -908,7 +944,9 @@ export class AdminClient extends DriftClient {
 		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 getPerpMarketPublicKey(
 						this.program.programId,
@@ -931,7 +969,9 @@ export class AdminClient extends DriftClient {
 		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 getPerpMarketPublicKey(
 						this.program.programId,
@@ -956,7 +996,9 @@ export class AdminClient extends DriftClient {
 		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 getPerpMarketPublicKey(
 						this.program.programId,
@@ -981,7 +1023,9 @@ export class AdminClient extends DriftClient {
 		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 getSpotMarketPublicKey(
 						this.program.programId,
@@ -1009,7 +1053,9 @@ export class AdminClient extends DriftClient {
 		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,
 				},
@@ -1034,7 +1080,9 @@ export class AdminClient extends DriftClient {
 		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,
 				},
@@ -1053,7 +1101,9 @@ export class AdminClient extends DriftClient {
 		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(),
 				},
 			});
@@ -1071,7 +1121,9 @@ export class AdminClient extends DriftClient {
 		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(),
 				},
 			});
@@ -1091,7 +1143,9 @@ export class AdminClient extends DriftClient {
 				initialPctToLiquidate,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 					},
 				}
@@ -1112,7 +1166,9 @@ export class AdminClient extends DriftClient {
 				liquidationDuration,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 					},
 				}
@@ -1133,7 +1189,9 @@ export class AdminClient extends DriftClient {
 				updateLiquidationMarginBufferRatio,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 					},
 				}
@@ -1154,7 +1212,9 @@ export class AdminClient extends DriftClient {
 		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(),
 				},
 			});
@@ -1174,7 +1234,9 @@ export class AdminClient extends DriftClient {
 				settlementDuration,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 					},
 				}
@@ -1195,7 +1257,9 @@ export class AdminClient extends DriftClient {
 				maxNumberOfSubAccounts,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 					},
 				}
@@ -1216,7 +1280,9 @@ export class AdminClient extends DriftClient {
 				maxInitializeUserFee,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 					},
 				}
@@ -1238,7 +1304,9 @@ export class AdminClient extends DriftClient {
 				withdrawGuardThreshold,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1267,7 +1335,9 @@ export class AdminClient extends DriftClient {
 				totalIfFactor,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1293,7 +1363,9 @@ export class AdminClient extends DriftClient {
 				revenueSettlePeriod,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1321,7 +1393,9 @@ export class AdminClient extends DriftClient {
 				maxTokenDeposits,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1347,7 +1421,9 @@ export class AdminClient extends DriftClient {
 				scaleInitialAssetWeightStart,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1375,7 +1451,9 @@ export class AdminClient extends DriftClient {
 				insuranceWithdrawEscrowPeriod,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1400,7 +1478,9 @@ export class AdminClient extends DriftClient {
 		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(),
 				},
 			});
@@ -1423,7 +1503,9 @@ export class AdminClient extends DriftClient {
 				oracleSource,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -1452,7 +1534,9 @@ export class AdminClient extends DriftClient {
 				tickSize,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -1478,7 +1562,9 @@ export class AdminClient extends DriftClient {
 		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 getPerpMarketPublicKey(
 						this.program.programId,
@@ -1505,7 +1591,9 @@ export class AdminClient extends DriftClient {
 				tickSize,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1531,7 +1619,9 @@ export class AdminClient extends DriftClient {
 		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 getSpotMarketPublicKey(
 						this.program.programId,
@@ -1554,7 +1644,9 @@ export class AdminClient extends DriftClient {
 		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 getPerpMarketPublicKey(
 						this.program.programId,
@@ -1580,7 +1672,9 @@ export class AdminClient extends DriftClient {
 				oracleSource,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1607,7 +1701,9 @@ export class AdminClient extends DriftClient {
 				ordersEnabled,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1633,7 +1729,9 @@ export class AdminClient extends DriftClient {
 				status,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						serumFulfillmentConfig,
 					},
@@ -1656,7 +1754,9 @@ export class AdminClient extends DriftClient {
 		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,
 				},
@@ -1678,7 +1778,9 @@ export class AdminClient extends DriftClient {
 		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 getSpotMarketPublicKey(
 						this.program.programId,
@@ -1700,7 +1802,9 @@ export class AdminClient extends DriftClient {
 		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(),
 				},
 			});
@@ -1718,7 +1822,9 @@ export class AdminClient extends DriftClient {
 		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(),
 				},
 			});
@@ -1747,7 +1853,9 @@ export class AdminClient extends DriftClient {
 				imfFactor,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1777,7 +1885,9 @@ export class AdminClient extends DriftClient {
 				optimalMaxRate,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1801,7 +1911,9 @@ export class AdminClient extends DriftClient {
 		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 getSpotMarketPublicKey(
 						this.program.programId,
@@ -1824,7 +1936,9 @@ export class AdminClient extends DriftClient {
 		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 getSpotMarketPublicKey(
 						this.program.programId,
@@ -1849,7 +1963,9 @@ export class AdminClient extends DriftClient {
 				pausedOperations,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -1873,7 +1989,9 @@ export class AdminClient extends DriftClient {
 		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 getPerpMarketPublicKey(
 						this.program.programId,
@@ -1898,7 +2016,9 @@ export class AdminClient extends DriftClient {
 				pausedOperations,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -1924,7 +2044,9 @@ export class AdminClient extends DriftClient {
 				contractTier,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -1947,7 +2069,9 @@ export class AdminClient extends DriftClient {
 		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(),
 				},
 			});
@@ -1967,7 +2091,9 @@ export class AdminClient extends DriftClient {
 				typeof minDuration === 'number' ? minDuration : minDuration.toNumber(),
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 					},
 				}
@@ -1988,7 +2114,9 @@ export class AdminClient extends DriftClient {
 				defaultAuctionDuration,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 					},
 				}
@@ -2010,7 +2138,9 @@ export class AdminClient extends DriftClient {
 				maxBaseAssetAmountRatio,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -2036,7 +2166,9 @@ export class AdminClient extends DriftClient {
 		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,
 				},
@@ -2060,7 +2192,9 @@ export class AdminClient extends DriftClient {
 				unrealizedMaintenanceAssetWeight,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -2092,7 +2226,9 @@ export class AdminClient extends DriftClient {
 				quoteMaxInsurance,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -2118,7 +2254,9 @@ export class AdminClient extends DriftClient {
 				maxOpenInterest,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -2144,7 +2282,9 @@ export class AdminClient extends DriftClient {
 				feeAdjustment,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -2168,7 +2308,9 @@ export class AdminClient extends DriftClient {
 			srmVault,
 			{
 				accounts: {
-					admin: this.wallet.publicKey,
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
 					srmVault: srmVault,
 				},
@@ -2193,7 +2335,9 @@ export class AdminClient extends DriftClient {
 				ifLiquidationFee,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						perpMarket: await getPerpMarketPublicKey(
 							this.program.programId,
@@ -2221,7 +2365,9 @@ export class AdminClient extends DriftClient {
 				ifLiquidationFee,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						spotMarket: await getSpotMarketPublicKey(
 							this.program.programId,
@@ -2242,7 +2388,9 @@ export class AdminClient extends DriftClient {
 		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: SYSVAR_RENT_PUBKEY,
 					systemProgram: anchor.web3.SystemProgram.programId,
@@ -2270,7 +2418,9 @@ export class AdminClient extends DriftClient {
 				maxTransferPerEpoch,
 				{
 					accounts: {
-						admin: this.wallet.publicKey,
+						admin: this.isSubscribed
+							? this.getStateAccount().admin
+							: this.wallet.publicKey,
 						state: await this.getStatePublicKey(),
 						protocolIfSharesTransferConfig:
 							getProtocolIfSharesTransferConfigPublicKey(
@@ -2296,7 +2446,6 @@ export class AdminClient extends DriftClient {
 	): Promise<TransactionSignature> {
 		const initializePrelaunchOracleIx =
 			await this.getInitializePrelaunchOracleIx(
-				this.wallet.publicKey,
 				perpMarketIndex,
 				price,
 				maxPrice
@@ -2310,7 +2459,6 @@ export class AdminClient extends DriftClient {
 	}
 
 	public async getInitializePrelaunchOracleIx(
-		admin: PublicKey,
 		perpMarketIndex: number,
 		price?: BN,
 		maxPrice?: BN
@@ -2323,7 +2471,9 @@ export class AdminClient extends 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 getPrelaunchOraclePublicKey(
 					this.program.programId,
@@ -2336,14 +2486,12 @@ export class AdminClient extends DriftClient {
 	}
 
 	public async updatePrelaunchOracleParams(
-		admin: PublicKey,
 		perpMarketIndex: number,
 		price?: BN,
 		maxPrice?: BN
 	): Promise<TransactionSignature> {
 		const updatePrelaunchOracleParamsIx =
 			await this.getUpdatePrelaunchOracleParamsIx(
-				this.wallet.publicKey,
 				perpMarketIndex,
 				price,
 				maxPrice
@@ -2357,7 +2505,6 @@ export class AdminClient extends DriftClient {
 	}
 
 	public async getUpdatePrelaunchOracleParamsIx(
-		admin: PublicKey,
 		perpMarketIndex: number,
 		price?: BN,
 		maxPrice?: BN
@@ -2375,7 +2522,9 @@ export class AdminClient extends DriftClient {
 
 		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 getPrelaunchOraclePublicKey(
@@ -2390,7 +2539,6 @@ export class AdminClient extends DriftClient {
 		perpMarketIndex: number
 	): Promise<TransactionSignature> {
 		const deletePrelaunchOracleIx = await this.getDeletePrelaunchOracleIx(
-			this.wallet.publicKey,
 			perpMarketIndex
 		);
 
@@ -2402,25 +2550,33 @@ export class AdminClient extends DriftClient {
 	}
 
 	public async getDeletePrelaunchOracleIx(
-		admin: PublicKey,
-		perpMarketIndex: number
+		perpMarketIndex: number,
+		price?: BN,
+		maxPrice?: BN
 	): Promise<TransactionInstruction> {
-		return await this.program.instruction.deletePrelaunchOracle(
+		const params = {
 			perpMarketIndex,
-			{
-				accounts: {
-					admin,
-					state: await this.getStatePublicKey(),
-					prelaunchOracle: await getPrelaunchOraclePublicKey(
-						this.program.programId,
-						perpMarketIndex
-					),
-					perpMarket: await getPerpMarketPublicKey(
-						this.program.programId,
-						perpMarketIndex
-					),
-				},
-			}
+			price: price || null,
+			maxPrice: maxPrice || null,
+		};
+
+		const perpMarketPublicKey = await getPerpMarketPublicKey(
+			this.program.programId,
+			perpMarketIndex
 		);
+
+		return await this.program.instruction.getDeletePrelaunchOracleIx(params, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				perpMarket: perpMarketPublicKey,
+				prelaunchOracle: await getPrelaunchOraclePublicKey(
+					this.program.programId,
+					perpMarketIndex
+				),
+			},
+		});
 	}
 }