@drift-labs/sdk 2.74.0-beta.10 → 2.74.0-beta.12

package/VERSION

@@ -1 +1 @@
-2.74.0-beta.10
+2.74.0-beta.12

package/lib/adminClient.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { PublicKey, TransactionSignature } from '@solana/web3.js';
+import { PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { FeeStructure, OracleGuardRails, OracleSource, ExchangeStatus, MarketStatus, ContractTier, AssetTier, SpotFulfillmentConfigStatus } from './types';
 import { BN } from '@coral-xyz/anchor';
 import { DriftClient } from './driftClient';
@@ -8,9 +8,15 @@ export declare class AdminClient extends DriftClient {
     initializeSpotMarket(mint: PublicKey, optimalUtilization: number, optimalRate: number, maxRate: number, oracle: PublicKey, oracleSource: OracleSource, initialAssetWeight: number, maintenanceAssetWeight: number, initialLiabilityWeight: number, maintenanceLiabilityWeight: number, imfFactor?: number, liquidatorFee?: number, ifLiquidationFee?: number, activeStatus?: boolean, assetTier?: {
         collateral: {};
     }, scaleInitialAssetWeightStart?: BN, withdrawGuardThreshold?: BN, orderTickSize?: BN, orderStepSize?: BN, ifTotalFactor?: number, name?: string): Promise<TransactionSignature>;
+    getInitializeSpotMarketIx(admin: PublicKey, mint: PublicKey, optimalUtilization: number, optimalRate: number, maxRate: number, oracle: PublicKey, oracleSource: OracleSource, initialAssetWeight: number, maintenanceAssetWeight: number, initialLiabilityWeight: number, maintenanceLiabilityWeight: number, imfFactor?: number, liquidatorFee?: number, ifLiquidationFee?: number, activeStatus?: boolean, assetTier?: {
+        collateral: {};
+    }, scaleInitialAssetWeightStart?: BN, withdrawGuardThreshold?: BN, orderTickSize?: BN, orderStepSize?: BN, ifTotalFactor?: number, name?: string): Promise<TransactionInstruction>;
     initializeSerumFulfillmentConfig(marketIndex: number, serumMarket: PublicKey, serumProgram: PublicKey): Promise<TransactionSignature>;
+    getInitializeSerumFulfillmentConfigIx(admin: PublicKey, marketIndex: number, serumMarket: PublicKey, serumProgram: PublicKey): Promise<TransactionInstruction>;
     initializePhoenixFulfillmentConfig(marketIndex: number, phoenixMarket: PublicKey): Promise<TransactionSignature>;
+    getInitializePhoenixFulfillmentConfigIx(admin: PublicKey, marketIndex: number, phoenixMarket: PublicKey): Promise<TransactionInstruction>;
     initializePerpMarket(marketIndex: number, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, ifLiquidatorFee?: number, imfFactor?: number, activeStatus?: boolean, baseSpread?: number, maxSpread?: number, maxOpenInterest?: BN, maxRevenueWithdrawPerPeriod?: BN, quoteMaxInsurance?: BN, orderStepSize?: BN, orderTickSize?: BN, minOrderSize?: BN, concentrationCoefScale?: BN, curveUpdateIntensity?: number, ammJitIntensity?: number, name?: string): Promise<TransactionSignature>;
+    getInitializePerpMarketIx(admin: PublicKey, marketIndex: number, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, ifLiquidatorFee?: number, imfFactor?: number, activeStatus?: boolean, baseSpread?: number, maxSpread?: number, maxOpenInterest?: BN, maxRevenueWithdrawPerPeriod?: BN, quoteMaxInsurance?: BN, orderStepSize?: BN, orderTickSize?: BN, minOrderSize?: BN, concentrationCoefScale?: BN, curveUpdateIntensity?: number, ammJitIntensity?: number, name?: string): Promise<TransactionInstruction>;
     deleteInitializedPerpMarket(marketIndex: number): Promise<TransactionSignature>;
     moveAmmPrice(perpMarketIndex: number, baseAssetReserve: BN, quoteAssetReserve: BN, sqrtK?: BN): Promise<TransactionSignature>;
     updateK(perpMarketIndex: number, sqrtK: BN): Promise<TransactionSignature>;
@@ -84,6 +90,8 @@ export declare class AdminClient extends DriftClient {
     initializeProtocolIfSharesTransferConfig(): Promise<TransactionSignature>;
     updateProtocolIfSharesTransferConfig(whitelistedSigners?: PublicKey[], maxTransferPerEpoch?: BN): Promise<TransactionSignature>;
     initializePrelaunchOracle(perpMarketIndex: number, price?: BN, maxPrice?: BN): Promise<TransactionSignature>;
-    updatePrelaunchOracleParams(perpMarketIndex: number, price?: BN, maxPrice?: BN): Promise<TransactionSignature>;
+    getInitializePrelaunchOracleIx(admin: PublicKey, perpMarketIndex: number, price?: BN, maxPrice?: BN): Promise<TransactionInstruction>;
+    updatePrelaunchOracleParams(admin: PublicKey, perpMarketIndex: number, price?: BN, maxPrice?: BN): Promise<TransactionSignature>;
+    getUpdatePrelaunchOracleParamsIx(admin: PublicKey, perpMarketIndex: number, price?: BN, maxPrice?: BN): Promise<TransactionInstruction>;
     deletePrelaunchOracle(perpMarketIndex: number): Promise<TransactionSignature>;
 }

package/lib/adminClient.js

@@ -60,6 +60,20 @@ class AdminClient extends driftClient_1.DriftClient {
         return [txSig];
     }
     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 tx = await this.buildTransaction(initializeIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        // const { txSig } = await this.sendTransaction(initializeTx, [], this.opts);
+        await this.accountSubscriber.addSpotMarket(spotMarketIndex);
+        await this.accountSubscriber.addOracle({
+            source: oracleSource,
+            publicKey: oracle,
+        });
+        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) {
         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);
@@ -67,7 +81,7 @@ 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: this.wallet.publicKey,
+                admin,
                 state: await this.getStatePublicKey(),
                 spotMarket,
                 spotMarketVault,
@@ -80,23 +94,20 @@ class AdminClient extends driftClient_1.DriftClient {
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
         });
+        return initializeIx;
+    }
+    async initializeSerumFulfillmentConfig(marketIndex, serumMarket, serumProgram) {
+        const initializeIx = await this.getInitializeSerumFulfillmentConfigIx(this.wallet.publicKey, marketIndex, serumMarket, serumProgram);
         const tx = await this.buildTransaction(initializeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        // const { txSig } = await this.sendTransaction(initializeTx, [], this.opts);
-        await this.accountSubscriber.addSpotMarket(spotMarketIndex);
-        await this.accountSubscriber.addOracle({
-            source: oracleSource,
-            publicKey: oracle,
-        });
-        await this.accountSubscriber.setSpotOracleMap();
         return txSig;
     }
-    async initializeSerumFulfillmentConfig(marketIndex, serumMarket, serumProgram) {
+    async getInitializeSerumFulfillmentConfigIx(admin, marketIndex, serumMarket, serumProgram) {
         const serumOpenOrders = (0, pda_1.getSerumOpenOrdersPublicKey)(this.program.programId, serumMarket);
         const serumFulfillmentConfig = (0, pda_1.getSerumFulfillmentConfigPublicKey)(this.program.programId, serumMarket);
-        const initializeIx = await this.program.instruction.initializeSerumFulfillmentConfig(marketIndex, {
+        return await this.program.instruction.initializeSerumFulfillmentConfig(marketIndex, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin,
                 state: await this.getStatePublicKey(),
                 baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
                 quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
@@ -109,15 +120,18 @@ class AdminClient extends driftClient_1.DriftClient {
                 serumFulfillmentConfig,
             },
         });
+    }
+    async initializePhoenixFulfillmentConfig(marketIndex, phoenixMarket) {
+        const initializeIx = await this.getInitializePhoenixFulfillmentConfigIx(this.wallet.publicKey, marketIndex, phoenixMarket);
         const tx = await this.buildTransaction(initializeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async initializePhoenixFulfillmentConfig(marketIndex, phoenixMarket) {
+    async getInitializePhoenixFulfillmentConfigIx(admin, marketIndex, phoenixMarket) {
         const phoenixFulfillmentConfig = (0, pda_1.getPhoenixFulfillmentConfigPublicKey)(this.program.programId, phoenixMarket);
-        const initializeIx = await this.program.instruction.initializePhoenixFulfillmentConfig(marketIndex, {
+        return await this.program.instruction.initializePhoenixFulfillmentConfig(marketIndex, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin,
                 state: await this.getStatePublicKey(),
                 baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
                 quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
@@ -129,24 +143,10 @@ class AdminClient extends driftClient_1.DriftClient {
                 phoenixFulfillmentConfig,
             },
         });
-        const tx = await this.buildTransaction(initializeIx);
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
     }
     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) {
         const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
-        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, currentPerpMarketIndex);
-        const nameBuffer = (0, userName_1.encodeName)(name);
-        const initializeMarketIx = 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, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                admin: this.wallet.publicKey,
-                oracle: priceOracle,
-                perpMarket: perpMarketPublicKey,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
-            },
-        });
+        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 tx = await this.buildTransaction(initializeMarketIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         while (this.getStateAccount().numberOfMarkets <= currentPerpMarketIndex) {
@@ -160,6 +160,21 @@ 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) {
+        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, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                admin,
+                oracle: priceOracle,
+                perpMarket: perpMarketPublicKey,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+            },
+        });
+    }
     async deleteInitializedPerpMarket(marketIndex) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         const deleteInitializeMarketIx = await this.program.instruction.deleteInitializedPerpMarket(marketIndex, {
@@ -1046,42 +1061,48 @@ 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 tx = await this.buildTransaction(initializePrelaunchOracleIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getInitializePrelaunchOracleIx(admin, perpMarketIndex, price, maxPrice) {
         const params = {
             perpMarketIndex,
             price: price || null,
             maxPrice: maxPrice || null,
         };
-        const initializePrelaunchOracleIx = await this.program.instruction.initializePrelaunchOracle(params, {
+        return await this.program.instruction.initializePrelaunchOracle(params, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin,
                 state: await this.getStatePublicKey(),
                 prelaunchOracle: await (0, pda_1.getPrelaunchOraclePublicKey)(this.program.programId, perpMarketIndex),
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                 systemProgram: anchor.web3.SystemProgram.programId,
             },
         });
-        const tx = await this.buildTransaction(initializePrelaunchOracleIx);
+    }
+    async updatePrelaunchOracleParams(admin, perpMarketIndex, price, maxPrice) {
+        const updatePrelaunchOracleParamsIx = await this.getUpdatePrelaunchOracleParamsIx(this.wallet.publicKey, perpMarketIndex, price, maxPrice);
+        const tx = await this.buildTransaction(updatePrelaunchOracleParamsIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePrelaunchOracleParams(perpMarketIndex, price, maxPrice) {
+    async getUpdatePrelaunchOracleParamsIx(admin, perpMarketIndex, price, maxPrice) {
         const params = {
             perpMarketIndex,
             price: price || null,
             maxPrice: maxPrice || null,
         };
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        const updatePrelaunchOracleParamsIx = await this.program.instruction.updatePrelaunchOracleParams(params, {
+        return await this.program.instruction.updatePrelaunchOracleParams(params, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin,
                 state: await this.getStatePublicKey(),
                 perpMarket: perpMarketPublicKey,
                 prelaunchOracle: await (0, pda_1.getPrelaunchOraclePublicKey)(this.program.programId, perpMarketIndex),
             },
         });
-        const tx = await this.buildTransaction(updatePrelaunchOracleParamsIx);
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
     }
     async deletePrelaunchOracle(perpMarketIndex) {
         const deletePrelaunchOracleIx = await this.program.instruction.deletePrelaunchOracle(perpMarketIndex, {

package/lib/idl/drift.json

@@ -3023,11 +3023,11 @@
                 },
                 {
                     "name": "curveUpdateIntensity",
-                    "type": "u16"
+                    "type": "u8"
                 },
                 {
-                    "name": "ammJitUpdateIntensity",
-                    "type": "u16"
+                    "name": "ammJitIntensity",
+                    "type": "u8"
                 },
                 {
                     "name": "name",
@@ -11711,8 +11711,5 @@
             "name": "CantReclaimRent",
             "msg": "CantReclaimRent"
         }
-    ],
-    "metadata": {
-        "address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
-    }
+    ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.74.0-beta.10",
+	"version": "2.74.0-beta.12",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/adminClient.ts

@@ -1,6 +1,7 @@
 import {
 	PublicKey,
 	SYSVAR_RENT_PUBKEY,
+	TransactionInstruction,
 	TransactionSignature,
 } from '@solana/web3.js';
 import {
@@ -101,6 +102,73 @@ export class AdminClient extends DriftClient {
 		name = DEFAULT_MARKET_NAME
 	): Promise<TransactionSignature> {
 		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 tx = await this.buildTransaction(initializeIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		// const { txSig } = await this.sendTransaction(initializeTx, [], this.opts);
+
+		await this.accountSubscriber.addSpotMarket(spotMarketIndex);
+		await this.accountSubscriber.addOracle({
+			source: oracleSource,
+			publicKey: oracle,
+		});
+		await this.accountSubscriber.setSpotOracleMap();
+
+		return txSig;
+	}
+
+	public async getInitializeSpotMarketIx(
+		admin: PublicKey,
+		mint: PublicKey,
+		optimalUtilization: number,
+		optimalRate: number,
+		maxRate: number,
+		oracle: PublicKey,
+		oracleSource: OracleSource,
+		initialAssetWeight: number,
+		maintenanceAssetWeight: number,
+		initialLiabilityWeight: number,
+		maintenanceLiabilityWeight: number,
+		imfFactor = 0,
+		liquidatorFee = 0,
+		ifLiquidationFee = 0,
+		activeStatus = true,
+		assetTier = AssetTier.COLLATERAL,
+		scaleInitialAssetWeightStart = ZERO,
+		withdrawGuardThreshold = ZERO,
+		orderTickSize = ONE,
+		orderStepSize = ONE,
+		ifTotalFactor = 0,
+		name = DEFAULT_MARKET_NAME
+	): Promise<TransactionInstruction> {
+		const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
 		const spotMarket = await getSpotMarketPublicKey(
 			this.program.programId,
 			spotMarketIndex
@@ -139,7 +207,7 @@ export class AdminClient extends DriftClient {
 			nameBuffer,
 			{
 				accounts: {
-					admin: this.wallet.publicKey,
+					admin,
 					state: await this.getStatePublicKey(),
 					spotMarket,
 					spotMarketVault,
@@ -154,27 +222,34 @@ export class AdminClient extends DriftClient {
 			}
 		);
 
-		const tx = await this.buildTransaction(initializeIx);
+		return initializeIx;
+	}
 
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+	public async initializeSerumFulfillmentConfig(
+		marketIndex: number,
+		serumMarket: PublicKey,
+		serumProgram: PublicKey
+	): Promise<TransactionSignature> {
+		const initializeIx = await this.getInitializeSerumFulfillmentConfigIx(
+			this.wallet.publicKey,
+			marketIndex,
+			serumMarket,
+			serumProgram
+		);
 
-		// const { txSig } = await this.sendTransaction(initializeTx, [], this.opts);
+		const tx = await this.buildTransaction(initializeIx);
 
-		await this.accountSubscriber.addSpotMarket(spotMarketIndex);
-		await this.accountSubscriber.addOracle({
-			source: oracleSource,
-			publicKey: oracle,
-		});
-		await this.accountSubscriber.setSpotOracleMap();
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		return txSig;
 	}
 
-	public async initializeSerumFulfillmentConfig(
+	public async getInitializeSerumFulfillmentConfigIx(
+		admin: PublicKey,
 		marketIndex: number,
 		serumMarket: PublicKey,
 		serumProgram: PublicKey
-	): Promise<TransactionSignature> {
+	): Promise<TransactionInstruction> {
 		const serumOpenOrders = getSerumOpenOrdersPublicKey(
 			this.program.programId,
 			serumMarket
@@ -185,25 +260,35 @@ export class AdminClient extends DriftClient {
 			serumMarket
 		);
 
-		const initializeIx =
-			await this.program.instruction.initializeSerumFulfillmentConfig(
-				marketIndex,
-				{
-					accounts: {
-						admin: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
-						quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
-						driftSigner: this.getSignerPublicKey(),
-						serumProgram,
-						serumMarket,
-						serumOpenOrders,
-						rent: SYSVAR_RENT_PUBKEY,
-						systemProgram: anchor.web3.SystemProgram.programId,
-						serumFulfillmentConfig,
-					},
-				}
-			);
+		return await this.program.instruction.initializeSerumFulfillmentConfig(
+			marketIndex,
+			{
+				accounts: {
+					admin,
+					state: await this.getStatePublicKey(),
+					baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
+					quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
+					driftSigner: this.getSignerPublicKey(),
+					serumProgram,
+					serumMarket,
+					serumOpenOrders,
+					rent: SYSVAR_RENT_PUBKEY,
+					systemProgram: anchor.web3.SystemProgram.programId,
+					serumFulfillmentConfig,
+				},
+			}
+		);
+	}
+
+	public async initializePhoenixFulfillmentConfig(
+		marketIndex: number,
+		phoenixMarket: PublicKey
+	): Promise<TransactionSignature> {
+		const initializeIx = await this.getInitializePhoenixFulfillmentConfigIx(
+			this.wallet.publicKey,
+			marketIndex,
+			phoenixMarket
+		);
 
 		const tx = await this.buildTransaction(initializeIx);
 
@@ -212,39 +297,33 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async initializePhoenixFulfillmentConfig(
+	public async getInitializePhoenixFulfillmentConfigIx(
+		admin: PublicKey,
 		marketIndex: number,
 		phoenixMarket: PublicKey
-	): Promise<TransactionSignature> {
+	): Promise<TransactionInstruction> {
 		const phoenixFulfillmentConfig = getPhoenixFulfillmentConfigPublicKey(
 			this.program.programId,
 			phoenixMarket
 		);
 
-		const initializeIx =
-			await this.program.instruction.initializePhoenixFulfillmentConfig(
-				marketIndex,
-				{
-					accounts: {
-						admin: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
-						quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
-						driftSigner: this.getSignerPublicKey(),
-						phoenixMarket: phoenixMarket,
-						phoenixProgram: PHOENIX_PROGRAM_ID,
-						rent: SYSVAR_RENT_PUBKEY,
-						systemProgram: anchor.web3.SystemProgram.programId,
-						phoenixFulfillmentConfig,
-					},
-				}
-			);
-
-		const tx = await this.buildTransaction(initializeIx);
-
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
-		return txSig;
+		return await this.program.instruction.initializePhoenixFulfillmentConfig(
+			marketIndex,
+			{
+				accounts: {
+					admin,
+					state: await this.getStatePublicKey(),
+					baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
+					quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
+					driftSigner: this.getSignerPublicKey(),
+					phoenixMarket: phoenixMarket,
+					phoenixProgram: PHOENIX_PROGRAM_ID,
+					rent: SYSVAR_RENT_PUBKEY,
+					systemProgram: anchor.web3.SystemProgram.programId,
+					phoenixFulfillmentConfig,
+				},
+			}
+		);
 	}
 
 	public async initializePerpMarket(
@@ -275,49 +354,35 @@ export class AdminClient extends DriftClient {
 		name = DEFAULT_MARKET_NAME
 	): Promise<TransactionSignature> {
 		const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
-		const perpMarketPublicKey = await getPerpMarketPublicKey(
-			this.program.programId,
-			currentPerpMarketIndex
-		);
 
-		const nameBuffer = encodeName(name);
-		const initializeMarketIx =
-			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,
-				{
-					accounts: {
-						state: await this.getStatePublicKey(),
-						admin: this.wallet.publicKey,
-						oracle: priceOracle,
-						perpMarket: perpMarketPublicKey,
-						rent: SYSVAR_RENT_PUBKEY,
-						systemProgram: anchor.web3.SystemProgram.programId,
-					},
-				}
-			);
+		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 tx = await this.buildTransaction(initializeMarketIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -336,6 +401,79 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getInitializePerpMarketIx(
+		admin: PublicKey,
+		marketIndex: number,
+		priceOracle: PublicKey,
+		baseAssetReserve: BN,
+		quoteAssetReserve: BN,
+		periodicity: BN,
+		pegMultiplier: BN = PEG_PRECISION,
+		oracleSource: OracleSource = OracleSource.PYTH,
+		marginRatioInitial = 2000,
+		marginRatioMaintenance = 500,
+		liquidatorFee = 0,
+		ifLiquidatorFee = 10000,
+		imfFactor = 0,
+		activeStatus = true,
+		baseSpread = 0,
+		maxSpread = 142500,
+		maxOpenInterest = ZERO,
+		maxRevenueWithdrawPerPeriod = ZERO,
+		quoteMaxInsurance = ZERO,
+		orderStepSize = BASE_PRECISION.divn(10000),
+		orderTickSize = PRICE_PRECISION.divn(100000),
+		minOrderSize = BASE_PRECISION.divn(10000),
+		concentrationCoefScale = ONE,
+		curveUpdateIntensity = 0,
+		ammJitIntensity = 0,
+		name = DEFAULT_MARKET_NAME
+	): Promise<TransactionInstruction> {
+		const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
+		const perpMarketPublicKey = await getPerpMarketPublicKey(
+			this.program.programId,
+			currentPerpMarketIndex
+		);
+
+		const nameBuffer = 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,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					admin,
+					oracle: priceOracle,
+					perpMarket: perpMarketPublicKey,
+					rent: SYSVAR_RENT_PUBKEY,
+					systemProgram: anchor.web3.SystemProgram.programId,
+				},
+			}
+		);
+	}
+
 	public async deleteInitializedPerpMarket(
 		marketIndex: number
 	): Promise<TransactionSignature> {
@@ -2156,38 +2294,74 @@ export class AdminClient extends DriftClient {
 		price?: BN,
 		maxPrice?: BN
 	): Promise<TransactionSignature> {
+		const initializePrelaunchOracleIx =
+			await this.getInitializePrelaunchOracleIx(
+				this.wallet.publicKey,
+				perpMarketIndex,
+				price,
+				maxPrice
+			);
+
+		const tx = await this.buildTransaction(initializePrelaunchOracleIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getInitializePrelaunchOracleIx(
+		admin: PublicKey,
+		perpMarketIndex: number,
+		price?: BN,
+		maxPrice?: BN
+	): Promise<TransactionInstruction> {
 		const params = {
 			perpMarketIndex,
 			price: price || null,
 			maxPrice: maxPrice || null,
 		};
 
-		const initializePrelaunchOracleIx =
-			await this.program.instruction.initializePrelaunchOracle(params, {
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					prelaunchOracle: await getPrelaunchOraclePublicKey(
-						this.program.programId,
-						perpMarketIndex
-					),
-					rent: SYSVAR_RENT_PUBKEY,
-					systemProgram: anchor.web3.SystemProgram.programId,
-				},
-			});
+		return await this.program.instruction.initializePrelaunchOracle(params, {
+			accounts: {
+				admin,
+				state: await this.getStatePublicKey(),
+				prelaunchOracle: await getPrelaunchOraclePublicKey(
+					this.program.programId,
+					perpMarketIndex
+				),
+				rent: SYSVAR_RENT_PUBKEY,
+				systemProgram: anchor.web3.SystemProgram.programId,
+			},
+		});
+	}
 
-		const tx = await this.buildTransaction(initializePrelaunchOracleIx);
+	public async updatePrelaunchOracleParams(
+		admin: PublicKey,
+		perpMarketIndex: number,
+		price?: BN,
+		maxPrice?: BN
+	): Promise<TransactionSignature> {
+		const updatePrelaunchOracleParamsIx =
+			await this.getUpdatePrelaunchOracleParamsIx(
+				this.wallet.publicKey,
+				perpMarketIndex,
+				price,
+				maxPrice
+			);
+
+		const tx = await this.buildTransaction(updatePrelaunchOracleParamsIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		return txSig;
 	}
 
-	public async updatePrelaunchOracleParams(
+	public async getUpdatePrelaunchOracleParamsIx(
+		admin: PublicKey,
 		perpMarketIndex: number,
 		price?: BN,
 		maxPrice?: BN
-	): Promise<TransactionSignature> {
+	): Promise<TransactionInstruction> {
 		const params = {
 			perpMarketIndex,
 			price: price || null,
@@ -2199,24 +2373,17 @@ export class AdminClient extends DriftClient {
 			perpMarketIndex
 		);
 
-		const updatePrelaunchOracleParamsIx =
-			await this.program.instruction.updatePrelaunchOracleParams(params, {
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					perpMarket: perpMarketPublicKey,
-					prelaunchOracle: await getPrelaunchOraclePublicKey(
-						this.program.programId,
-						perpMarketIndex
-					),
-				},
-			});
-
-		const tx = await this.buildTransaction(updatePrelaunchOracleParamsIx);
-
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
-		return txSig;
+		return await this.program.instruction.updatePrelaunchOracleParams(params, {
+			accounts: {
+				admin,
+				state: await this.getStatePublicKey(),
+				perpMarket: perpMarketPublicKey,
+				prelaunchOracle: await getPrelaunchOraclePublicKey(
+					this.program.programId,
+					perpMarketIndex
+				),
+			},
+		});
 	}
 
 	public async deletePrelaunchOracle(

package/src/idl/drift.json

@@ -3023,11 +3023,11 @@
         },
         {
           "name": "curveUpdateIntensity",
-          "type": "u16"
+          "type": "u8"
         },
         {
-          "name": "ammJitUpdateIntensity",
-          "type": "u16"
+          "name": "ammJitIntensity",
+          "type": "u8"
         },
         {
           "name": "name",
@@ -11711,8 +11711,5 @@
       "name": "CantReclaimRent",
       "msg": "CantReclaimRent"
     }
-  ],
-  "metadata": {
-    "address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
-  }
+  ]
 }