@drift-labs/sdk 2.130.0-beta.9 → 2.130.0

package/src/accounts/{driftClientAccount/grpcDriftClientAccountSubscriber.ts → grpcDriftClientAccountSubscriber.ts}

@@ -1,20 +1,16 @@
 import { WebSocketDriftClientAccountSubscriber } from './webSocketDriftClientAccountSubscriber';
-import { OracleInfo, OraclePriceData } from '../../oracles/types';
+import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { Program } from '@coral-xyz/anchor';
-import { findAllMarketAndOracles } from '../../config';
+import { findAllMarketAndOracles } from '../config';
 import {
 	getDriftStateAccountPublicKey,
 	getPerpMarketPublicKey,
 	getSpotMarketPublicKey,
-} from '../../addresses/pda';
-import { DelistedMarketSetting, GrpcConfigs, ResubOpts } from '../types';
-import { grpcAccountSubscriber } from '../baseSubscribers/grpcAccountSubscriber';
-import {
-	PerpMarketAccount,
-	SpotMarketAccount,
-	StateAccount,
-} from '../../types';
-import { getOracleId } from '../../oracles/oracleId';
+} from '../addresses/pda';
+import { DelistedMarketSetting, GrpcConfigs, ResubOpts } from './types';
+import { grpcAccountSubscriber } from './grpcAccountSubscriber';
+import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
+import { getOracleId } from '../oracles/oracleId';
 
 export class gprcDriftClientAccountSubscriber extends WebSocketDriftClientAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;

package/src/accounts/{insuranceFundStakeAccount/grpcInsuranceFundStakeAccountSubscriber.ts → grpcInsuranceFundStakeAccountSubscriber.ts}

@@ -1,9 +1,9 @@
-import { GrpcConfigs } from '../types';
+import { GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
-import { InsuranceFundStake } from '../../types';
+import { InsuranceFundStake } from '../types';
 import { WebSocketInsuranceFundStakeAccountSubscriber } from './webSocketInsuranceFundStakeAccountSubscriber';
-import { grpcAccountSubscriber } from '../baseSubscribers/grpcAccountSubscriber';
+import { grpcAccountSubscriber } from './grpcAccountSubscriber';
 
 export class grpcInsuranceFundStakeAccountSubscriber extends WebSocketInsuranceFundStakeAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;

package/src/accounts/{programAccount/grpcProgramAccountSubscriber.ts → grpcProgramAccountSubscriber.ts}

@@ -1,4 +1,4 @@
-import { ResubOpts, GrpcConfigs } from '../types';
+import { ResubOpts, GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import bs58 from 'bs58';
 import { Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
@@ -11,7 +11,7 @@ import {
 	createClient,
 	SubscribeRequest,
 	SubscribeUpdate,
-} from '../../isomorphic/grpc';
+} from '../isomorphic/grpc';
 
 export class grpcProgramAccountSubscriber<
 	T,
@@ -20,6 +20,7 @@ export class grpcProgramAccountSubscriber<
 	private stream: ClientDuplexStream<SubscribeRequest, SubscribeUpdate>;
 	private commitmentLevel: CommitmentLevel;
 	public listenerId?: number;
+	private enableReconnect: boolean;
 
 	private constructor(
 		client: Client,
@@ -31,7 +32,8 @@ export class grpcProgramAccountSubscriber<
 		options: { filters: MemcmpFilter[] } = {
 			filters: [],
 		},
-		resubOpts?: ResubOpts
+		resubOpts?: ResubOpts,
+		enableReconnect = false
 	) {
 		super(
 			subscriptionName,
@@ -43,6 +45,7 @@ export class grpcProgramAccountSubscriber<
 		);
 		this.client = client;
 		this.commitmentLevel = commitmentLevel;
+		this.enableReconnect = enableReconnect;
 	}
 
 	public static async create<U>(
@@ -73,7 +76,8 @@ export class grpcProgramAccountSubscriber<
 			program,
 			decodeBufferFn,
 			options,
-			resubOpts
+			resubOpts,
+			grpcConfigs.enableReconnect
 		);
 	}
 
@@ -119,15 +123,26 @@ export class grpcProgramAccountSubscriber<
 			entry: {},
 			transactionsStatus: {},
 		};
-		this.stream.on('error', (error) => {
-			// @ts-ignore
-			if (error.code === 1) {
-				// expected: 1 CANCELLED: Cancelled on client
-				return;
-			} else {
-				console.error('GRPC unexpected error caught:', error);
-			}
-		});
+
+		if (this.enableReconnect) {
+			this.stream.on('error', (error) => {
+				// @ts-ignore
+				if (error.code === 1) {
+					// expected: 1 CANCELLED: Cancelled on client
+					console.error(
+						'GRPC (grpcProgramAccountSubscriber) Cancelled on client caught:',
+						error
+					);
+					return;
+				} else {
+					console.error(
+						'GRPC (grpcProgramAccountSubscriber) unexpected error caught:',
+						error
+					);
+				}
+			});
+		}
+
 		this.stream.on('data', (chunk: SubscribeUpdate) => {
 			if (!chunk.account) {
 				return;

package/src/accounts/{userAccount/grpcUserAccountSubscriber.ts → grpcUserAccountSubscriber.ts}

@@ -1,9 +1,9 @@
-import { ResubOpts, GrpcConfigs } from '../types';
+import { ResubOpts, GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
-import { UserAccount } from '../../types';
+import { UserAccount } from '../types';
 import { WebSocketUserAccountSubscriber } from './webSocketUserAccountSubscriber';
-import { grpcAccountSubscriber } from '../baseSubscribers/grpcAccountSubscriber';
+import { grpcAccountSubscriber } from './grpcAccountSubscriber';
 
 export class grpcUserAccountSubscriber extends WebSocketUserAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;

package/src/accounts/{userStatsAccount/grpcUserStatsAccountSubscriber.ts → grpcUserStatsAccountSubscriber.ts}

@@ -1,9 +1,9 @@
-import { ResubOpts, GrpcConfigs } from '../types';
+import { ResubOpts, GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
-import { UserStatsAccount } from '../../types';
+import { UserStatsAccount } from '../types';
 import { WebSocketUserStatsAccountSubscriber } from './webSocketUserStatsAccountSubsriber';
-import { grpcAccountSubscriber } from '../baseSubscribers/grpcAccountSubscriber';
+import { grpcAccountSubscriber } from './grpcAccountSubscriber';
 
 export class grpcUserStatsAccountSubscriber extends WebSocketUserStatsAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;

package/src/accounts/{userAccount/oneShotUserAccountSubscriber.ts → oneShotUserAccountSubscriber.ts}

@@ -1,8 +1,8 @@
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { UserAccount } from '../../types';
+import { UserAccount } from '../types';
 import { BasicUserAccountSubscriber } from './basicUserAccountSubscriber';
 import { Program } from '@coral-xyz/anchor';
-import { UserAccountSubscriber } from '../types';
+import { UserAccountSubscriber } from './types';
 
 /**
  * Simple implementation of UserAccountSubscriber. It will fetch the UserAccount

package/src/accounts/{driftClientAccount/pollingDriftClientAccountSubscriber.ts → pollingDriftClientAccountSubscriber.ts}

@@ -6,7 +6,7 @@ import {
 	DriftClientAccountSubscriber,
 	NotSubscribedError,
 	OraclesToPoll,
-} from '../types';
+} from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -16,20 +16,20 @@ import {
 	StateAccount,
 	UserAccount,
 	OracleSource,
-} from '../../types';
+} from '../types';
 import {
 	getDriftStateAccountPublicKey,
 	getPerpMarketPublicKey,
 	getSpotMarketPublicKey,
-} from '../../addresses/pda';
-import { BulkAccountLoader } from '../bulkAccountLoader/bulkAccountLoader';
-import { capitalize, findDelistedPerpMarketsAndOracles } from '../utils';
+} from '../addresses/pda';
+import { BulkAccountLoader } from './bulkAccountLoader';
+import { capitalize, findDelistedPerpMarketsAndOracles } from './utils';
 import { PublicKey } from '@solana/web3.js';
-import { OracleInfo, OraclePriceData } from '../../oracles/types';
-import { OracleClientCache } from '../../oracles/oracleClientCache';
-import { QUOTE_ORACLE_PRICE_DATA } from '../../oracles/quoteAssetOracleClient';
-import { findAllMarketAndOracles } from '../../config';
-import { getOracleId } from '../../oracles/oracleId';
+import { OracleInfo, OraclePriceData } from '../oracles/types';
+import { OracleClientCache } from '../oracles/oracleClientCache';
+import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
+import { findAllMarketAndOracles } from '../config';
+import { getOracleId } from '../oracles/oracleId';
 
 const ORACLE_DEFAULT_ID = getOracleId(
 	PublicKey.default,

package/src/accounts/{highLeverageModeConfigAccount/pollingHighLeverageModeConfigAccountSubscriber.ts → pollingHighLeverageModeConfigAccountSubscriber.ts}

@@ -3,13 +3,13 @@ import {
 	NotSubscribedError,
 	HighLeverageModeConfigAccountEvents,
 	HighLeverageModeConfigAccountSubscriber,
-} from '../types';
+} from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../bulkAccountLoader/bulkAccountLoader';
-import { HighLeverageModeConfig } from '../../types';
+import { BulkAccountLoader } from './bulkAccountLoader';
+import { HighLeverageModeConfig } from '../types';
 
 export class PollingHighLeverageModeConfigAccountSubscriber
 	implements HighLeverageModeConfigAccountSubscriber

package/src/accounts/{insuranceFundStakeAccount/pollingInsuranceFundStakeAccountSubscriber.ts → pollingInsuranceFundStakeAccountSubscriber.ts}

@@ -3,13 +3,13 @@ import {
 	NotSubscribedError,
 	InsuranceFundStakeAccountEvents,
 	InsuranceFundStakeAccountSubscriber,
-} from '../types';
+} from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../bulkAccountLoader/bulkAccountLoader';
-import { InsuranceFundStake } from '../../types';
+import { BulkAccountLoader } from './bulkAccountLoader';
+import { InsuranceFundStake } from '../types';
 
 export class PollingInsuranceFundStakeAccountSubscriber
 	implements InsuranceFundStakeAccountSubscriber

package/src/accounts/{oracleAccount/pollingOracleAccountSubscriber.ts → pollingOracleAccountSubscriber.ts}

@@ -3,13 +3,13 @@ import {
 	NotSubscribedError,
 	OracleEvents,
 	OracleAccountSubscriber,
-} from '../types';
+} from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../bulkAccountLoader/bulkAccountLoader';
-import { OracleClient, OraclePriceData } from '../../oracles/types';
+import { BulkAccountLoader } from './bulkAccountLoader';
+import { OracleClient, OraclePriceData } from '../oracles/types';
 
 export class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
 	isSubscribed: boolean;

package/src/accounts/{tokenAccount/pollingTokenAccountSubscriber.ts → pollingTokenAccountSubscriber.ts}

@@ -3,14 +3,14 @@ import {
 	NotSubscribedError,
 	TokenAccountEvents,
 	TokenAccountSubscriber,
-} from '../types';
+} from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from './bulkAccountLoader';
 import { Account } from '@solana/spl-token';
-import { parseTokenAccount } from '../../token';
+import { parseTokenAccount } from '../token';
 
 export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 	isSubscribed: boolean;

package/src/accounts/{userAccount/pollingUserAccountSubscriber.ts → pollingUserAccountSubscriber.ts}

@@ -3,13 +3,13 @@ import {
 	NotSubscribedError,
 	UserAccountEvents,
 	UserAccountSubscriber,
-} from '../types';
-import { Connection } from '../../bankrun/bankrunConnection';
+} from './types';
+import { Connection } from '../bankrun/bankrunConnection';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import { UserAccount } from '../../types';
-import { BulkAccountLoader } from '../bulkAccountLoader/bulkAccountLoader';
+import { UserAccount } from '../types';
+import { BulkAccountLoader } from './bulkAccountLoader';
 
 export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;

package/src/accounts/{userStatsAccount/pollingUserStatsAccountSubscriber.ts → pollingUserStatsAccountSubscriber.ts}

@@ -3,13 +3,13 @@ import {
 	NotSubscribedError,
 	UserStatsAccountSubscriber,
 	UserStatsAccountEvents,
-} from '../types';
+} from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import { UserStatsAccount } from '../../types';
-import { BulkAccountLoader } from '../bulkAccountLoader/bulkAccountLoader';
+import { UserStatsAccount } from '../types';
+import { BulkAccountLoader } from './bulkAccountLoader';
 
 export class PollingUserStatsAccountSubscriber
 	implements UserStatsAccountSubscriber

package/src/accounts/types.ts

@@ -13,6 +13,7 @@ import { EventEmitter } from 'events';
 import { Context, PublicKey } from '@solana/web3.js';
 import { Account } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
+import { User } from '../user';
 import { ChannelOptions, CommitmentLevel } from '../isomorphic/grpc';
 
 export interface AccountSubscriber<T> {
@@ -102,6 +103,12 @@ export interface UserAccountEvents {
 	error: (e: Error) => void;
 }
 
+export interface UserEvents {
+	userUpdate: (payload: User) => void;
+	update: void;
+	error: (e: Error) => void;
+}
+
 export interface UserAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
 	isSubscribed: boolean;
@@ -219,6 +226,11 @@ export type GrpcConfigs = {
 	token: string;
 	commitmentLevel?: CommitmentLevel;
 	channelOptions?: ChannelOptions;
+	/**
+	 * Whether to enable automatic reconnection on connection loss .
+	 * Defaults to false, will throw on connection loss.
+	 */
+	enableReconnect?: boolean;
 };
 
 export interface HighLeverageModeConfigAccountSubscriber {

package/src/accounts/{baseSubscribers/webSocketAccountSubscriber.ts → webSocketAccountSubscriber.ts}

@@ -3,10 +3,10 @@ import {
 	BufferAndSlot,
 	AccountSubscriber,
 	ResubOpts,
-} from '../types';
+} from './types';
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { AccountInfo, Commitment, Context, PublicKey } from '@solana/web3.js';
-import { capitalize } from '../utils';
+import { capitalize } from './utils';
 import * as Buffer from 'buffer';
 
 export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {

package/src/accounts/{driftClientAccount/webSocketDriftClientAccountSubscriber.ts → webSocketDriftClientAccountSubscriber.ts}

@@ -6,12 +6,8 @@ import {
 	DriftClientAccountSubscriber,
 	NotSubscribedError,
 	ResubOpts,
-} from '../types';
-import {
-	PerpMarketAccount,
-	SpotMarketAccount,
-	StateAccount,
-} from '../../types';
+} from './types';
+import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -21,17 +17,17 @@ import {
 	getPerpMarketPublicKeySync,
 	getSpotMarketPublicKey,
 	getSpotMarketPublicKeySync,
-} from '../../addresses/pda';
-import { WebSocketAccountSubscriber } from '../baseSubscribers/webSocketAccountSubscriber';
+} from '../addresses/pda';
+import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { OracleInfo, OraclePriceData } from '../../oracles/types';
-import { OracleClientCache } from '../../oracles/oracleClientCache';
+import { OracleInfo, OraclePriceData } from '../oracles/types';
+import { OracleClientCache } from '../oracles/oracleClientCache';
 import * as Buffer from 'buffer';
-import { QUOTE_ORACLE_PRICE_DATA } from '../../oracles/quoteAssetOracleClient';
-import { findAllMarketAndOracles } from '../../config';
-import { findDelistedPerpMarketsAndOracles } from '../utils';
-import { getOracleId } from '../../oracles/oracleId';
-import { OracleSource } from '../../types';
+import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
+import { findAllMarketAndOracles } from '../config';
+import { findDelistedPerpMarketsAndOracles } from './utils';
+import { getOracleId } from '../oracles/oracleId';
+import { OracleSource } from '../types';
 
 const ORACLE_DEFAULT_ID = getOracleId(
 	PublicKey.default,

package/src/accounts/{highLeverageModeConfigAccount/webSocketHighLeverageModeConfigAccountSubscriber.ts → webSocketHighLeverageModeConfigAccountSubscriber.ts}

@@ -4,13 +4,13 @@ import {
 	NotSubscribedError,
 	HighLeverageModeConfigAccountEvents,
 	HighLeverageModeConfigAccountSubscriber,
-} from '../types';
+} from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { WebSocketAccountSubscriber } from '../baseSubscribers/webSocketAccountSubscriber';
-import { HighLeverageModeConfig } from '../../types';
+import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
+import { HighLeverageModeConfig } from '../types';
 
 export class WebSocketHighLeverageModeConfigAccountSubscriber
 	implements HighLeverageModeConfigAccountSubscriber

package/src/accounts/{insuranceFundStakeAccount/webSocketInsuranceFundStakeAccountSubscriber.ts → webSocketInsuranceFundStakeAccountSubscriber.ts}

@@ -4,13 +4,13 @@ import {
 	NotSubscribedError,
 	InsuranceFundStakeAccountEvents,
 	InsuranceFundStakeAccountSubscriber,
-} from '../types';
+} from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { WebSocketAccountSubscriber } from '../baseSubscribers/webSocketAccountSubscriber';
-import { InsuranceFundStake } from '../../types';
+import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
+import { InsuranceFundStake } from '../types';
 
 export class WebSocketInsuranceFundStakeAccountSubscriber
 	implements InsuranceFundStakeAccountSubscriber

package/src/accounts/{programAccount/webSocketProgramAccountSubscriber.ts → webSocketProgramAccountSubscriber.ts}

@@ -1,4 +1,4 @@
-import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from '../types';
+import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import {
 	Commitment,

package/src/accounts/{userAccount/webSocketUserAccountSubscriber.ts → webSocketUserAccountSubscriber.ts}

@@ -5,13 +5,13 @@ import {
 	UserAccountEvents,
 	UserAccountSubscriber,
 	ResubOpts,
-} from '../types';
+} from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { WebSocketAccountSubscriber } from '../baseSubscribers/webSocketAccountSubscriber';
-import { UserAccount } from '../../types';
+import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
+import { UserAccount } from '../types';
 
 export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;

package/src/accounts/{userStatsAccount/webSocketUserStatsAccountSubsriber.ts → webSocketUserStatsAccountSubsriber.ts}

@@ -5,13 +5,13 @@ import {
 	UserStatsAccountSubscriber,
 	UserStatsAccountEvents,
 	ResubOpts,
-} from '../types';
+} from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { WebSocketAccountSubscriber } from '../baseSubscribers/webSocketAccountSubscriber';
-import { UserStatsAccount } from '../../types';
+import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
+import { UserStatsAccount } from '../types';
 
 export class WebSocketUserStatsAccountSubscriber
 	implements UserStatsAccountSubscriber

package/src/adminClient.ts

@@ -4552,33 +4552,6 @@ export class AdminClient extends DriftClient {
 		});
 	}
 
-	public async updateDisableBitFlagsMMOracle(
-		disable: boolean
-	): Promise<TransactionSignature> {
-		const updateDisableBitFlagsMMOracleIx =
-			await this.getUpdateDisableBitFlagsMMOracleIx(disable);
-
-		const tx = await this.buildTransaction(updateDisableBitFlagsMMOracleIx);
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
-		return txSig;
-	}
-	public async getUpdateDisableBitFlagsMMOracleIx(
-		disable: boolean
-	): Promise<TransactionInstruction> {
-		return await this.program.instruction.updateDisableBitflagsMmOracle(
-			disable,
-			{
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-				},
-			}
-		);
-	}
-
 	public async zeroMMOracleFields(
 		marketIndex: number
 	): Promise<TransactionSignature> {
@@ -4591,6 +4564,7 @@ export class AdminClient extends DriftClient {
 
 		return txSig;
 	}
+
 	public async getZeroMMOracleFieldsIx(
 		marketIndex: number
 	): Promise<TransactionInstruction> {
@@ -4607,4 +4581,32 @@ export class AdminClient extends DriftClient {
 			},
 		});
 	}
+
+	public async updateFeatureBitFlagsMMOracle(
+		enable: boolean
+	): Promise<TransactionSignature> {
+		const updateFeatureBitFlagsMMOracleIx =
+			await this.getUpdateFeatureBitFlagsMMOracleIx(enable);
+
+		const tx = await this.buildTransaction(updateFeatureBitFlagsMMOracleIx);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getUpdateFeatureBitFlagsMMOracleIx(
+		enable: boolean
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateFeatureBitFlagsMmOracle(
+			enable,
+			{
+				accounts: {
+					admin: this.useHotWalletAdmin
+						? this.wallet.publicKey
+						: this.getStateAccount().admin,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
 }

package/src/auctionSubscriber/auctionSubscriber.ts

@@ -5,7 +5,7 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { UserAccount } from '../types';
 import { ConfirmOptions, Context, PublicKey } from '@solana/web3.js';
-import { WebSocketProgramAccountSubscriber } from '../accounts/programAccount/webSocketProgramAccountSubscriber';
+import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { ResubOpts } from '../accounts/types';
 
 export class AuctionSubscriber {

package/src/auctionSubscriber/auctionSubscriberGrpc.ts

@@ -5,9 +5,9 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { UserAccount } from '../types';
 import { ConfirmOptions, Context, PublicKey } from '@solana/web3.js';
-import { WebSocketProgramAccountSubscriber } from '../accounts/programAccount/webSocketProgramAccountSubscriber';
+import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { GrpcConfigs, ResubOpts } from '../accounts/types';
-import { grpcProgramAccountSubscriber } from '../accounts/programAccount/grpcProgramAccountSubscriber';
+import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
 
 export class AuctionSubscriberGrpc {
 	private driftClient: DriftClient;

package/src/{config/index.ts → config.ts}

@@ -1,25 +1,24 @@
 import { ConfirmOptions, PublicKey } from '@solana/web3.js';
-import { PerpMarketAccount, SpotMarketAccount } from '../types';
+import { PerpMarketAccount, SpotMarketAccount } from './types';
 import {
 	DevnetPerpMarkets,
 	MainnetPerpMarkets,
 	PerpMarketConfig,
 	PerpMarkets,
-} from '../constants/perpMarkets';
+} from './constants/perpMarkets';
 import {
 	SpotMarketConfig,
 	SpotMarkets,
 	DevnetSpotMarkets,
 	MainnetSpotMarkets,
-} from '../constants/spotMarkets';
-import { OracleInfo } from '../oracles/types';
+} from './constants/spotMarkets';
+import { OracleInfo } from './oracles/types';
 import { Program, ProgramAccount } from '@coral-xyz/anchor';
 import {
 	ON_DEMAND_DEVNET_PID,
 	ON_DEMAND_MAINNET_PID,
 } from '@switchboard-xyz/on-demand';
-import { getOracleId } from '../oracles/oracleId';
-import { DriftEnv } from './types';
+import { getOracleId } from './oracles/oracleId';
 
 type DriftConfig = {
 	ENV: DriftEnv;
@@ -42,6 +41,8 @@ type DriftConfig = {
 	SB_ON_DEMAND_PID: PublicKey;
 };
 
+export type DriftEnv = 'devnet' | 'mainnet-beta';
+
 export const DRIFT_PROGRAM_ID = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 export const DRIFT_ORACLE_RECEIVER_ID =
 	'G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha';

package/src/constants/perpMarkets.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import { OracleSource } from '../types';
-import { DriftEnv } from '../config/types';
+import { DriftEnv } from '../config';
 
 export type PerpMarketConfig = {
 	fullName?: string;

package/src/constants/spotMarkets.ts

@@ -11,7 +11,7 @@ import {
 } from './numericConstants';
 import { OracleSource } from '../types';
 import { BN } from '@coral-xyz/anchor';
-import { DriftEnv } from '../config/types';
+import { DriftEnv } from '../config';
 
 export type SpotMarketConfig = {
 	symbol: string;