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

package/VERSION

@@ -1 +1 @@
-2.130.0-beta.8
+2.130.0-beta.16

package/lib/browser/accounts/grpcAccountSubscriber.d.ts

@@ -9,6 +9,7 @@ export declare class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber
     private stream;
     private commitmentLevel;
     listenerId?: number;
+    private enableReconnect;
     private constructor();
     static create<U>(grpcConfigs: GrpcConfigs, accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => U, resubOpts?: ResubOpts): Promise<grpcAccountSubscriber<U>>;
     subscribe(onChange: (data: T) => void): Promise<void>;

package/lib/browser/accounts/grpcAccountSubscriber.js

@@ -29,10 +29,11 @@ const Buffer = __importStar(require("buffer"));
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 const grpc_1 = require("../isomorphic/grpc");
 class grpcAccountSubscriber extends webSocketAccountSubscriber_1.WebSocketAccountSubscriber {
-    constructor(client, commitmentLevel, accountName, program, accountPublicKey, decodeBuffer, resubOpts) {
+    constructor(client, commitmentLevel, accountName, program, accountPublicKey, decodeBuffer, resubOpts, enableReconnect = false) {
         super(accountName, program, accountPublicKey, decodeBuffer, resubOpts);
         this.client = client;
         this.commitmentLevel = commitmentLevel;
+        this.enableReconnect = enableReconnect;
     }
     static async create(grpcConfigs, accountName, program, accountPublicKey, decodeBuffer, resubOpts) {
         var _a, _b;
@@ -40,7 +41,7 @@ class grpcAccountSubscriber extends webSocketAccountSubscriber_1.WebSocketAccoun
         const commitmentLevel = 
         // @ts-ignore :: isomorphic exported enum fails typescript but will work at runtime
         (_b = grpcConfigs.commitmentLevel) !== null && _b !== void 0 ? _b : CommitmentLevel.CONFIRMED;
-        return new grpcAccountSubscriber(client, commitmentLevel, accountName, program, accountPublicKey, decodeBuffer, resubOpts);
+        return new grpcAccountSubscriber(client, commitmentLevel, accountName, program, accountPublicKey, decodeBuffer, resubOpts, grpcConfigs.enableReconnect);
     }
     async subscribe(onChange) {
         if (this.listenerId != null || this.isUnsubscribing) {
@@ -70,16 +71,19 @@ class grpcAccountSubscriber extends webSocketAccountSubscriber_1.WebSocketAccoun
             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 (grpcAccountSubscriber) Cancelled on client caught:', error);
+                    return;
+                }
+                else {
+                    console.error('GRPC (grpcAccountSubscriber) unexpected error caught:', error);
+                }
+            });
+        }
         this.stream.on('data', (chunk) => {
             var _a;
             if (!chunk.account) {

package/lib/browser/accounts/grpcProgramAccountSubscriber.d.ts

@@ -9,6 +9,7 @@ export declare class grpcProgramAccountSubscriber<T> extends WebSocketProgramAcc
     private stream;
     private commitmentLevel;
     listenerId?: number;
+    private enableReconnect;
     private constructor();
     static create<U>(grpcConfigs: GrpcConfigs, subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => U, options?: {
         filters: MemcmpFilter[];

package/lib/browser/accounts/grpcProgramAccountSubscriber.js

@@ -35,10 +35,11 @@ const grpc_1 = require("../isomorphic/grpc");
 class grpcProgramAccountSubscriber extends webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber {
     constructor(client, commitmentLevel, subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
-    }, resubOpts) {
+    }, resubOpts, enableReconnect = false) {
         super(subscriptionName, accountDiscriminator, program, decodeBufferFn, options, resubOpts);
         this.client = client;
         this.commitmentLevel = commitmentLevel;
+        this.enableReconnect = enableReconnect;
     }
     static async create(grpcConfigs, subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
@@ -48,7 +49,7 @@ class grpcProgramAccountSubscriber extends webSocketProgramAccountSubscriber_1.W
         const commitmentLevel = 
         // @ts-ignore :: isomorphic exported enum fails typescript but will work at runtime
         (_b = grpcConfigs.commitmentLevel) !== null && _b !== void 0 ? _b : CommitmentLevel.CONFIRMED;
-        return new grpcProgramAccountSubscriber(client, commitmentLevel, subscriptionName, accountDiscriminator, program, decodeBufferFn, options, resubOpts);
+        return new grpcProgramAccountSubscriber(client, commitmentLevel, subscriptionName, accountDiscriminator, program, decodeBufferFn, options, resubOpts, grpcConfigs.enableReconnect);
     }
     async subscribe(onChange) {
         if (this.listenerId != null || this.isUnsubscribing) {
@@ -83,16 +84,19 @@ class grpcProgramAccountSubscriber extends webSocketProgramAccountSubscriber_1.W
             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) => {
             var _a;
             if (!chunk.account) {

package/lib/browser/accounts/types.d.ts

@@ -158,6 +158,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 {
     eventEmitter: StrictEventEmitter<EventEmitter, HighLeverageModeConfigAccountEvents>;

package/lib/browser/adminClient.d.ts

@@ -230,8 +230,8 @@ export declare class AdminClient extends DriftClient {
     getUpdateProtectedMakerModeConfigIx(maxUsers: number, reduceOnly: boolean, currentUsers: undefined): Promise<TransactionInstruction>;
     adminDeposit(marketIndex: number, amount: BN, depositUserAccount: PublicKey, adminTokenAccount?: PublicKey): Promise<TransactionSignature>;
     getAdminDepositIx(marketIndex: number, amount: BN, depositUserAccount: PublicKey, adminTokenAccount?: PublicKey): Promise<TransactionInstruction>;
-    updateDisableBitFlagsMMOracle(disable: boolean): Promise<TransactionSignature>;
-    getUpdateDisableBitFlagsMMOracleIx(disable: boolean): Promise<TransactionInstruction>;
     zeroMMOracleFields(marketIndex: number): Promise<TransactionSignature>;
     getZeroMMOracleFieldsIx(marketIndex: number): Promise<TransactionInstruction>;
+    updateFeatureBitFlagsMMOracle(enable: boolean): Promise<TransactionSignature>;
+    getUpdateFeatureBitFlagsMMOracleIx(enable: boolean): Promise<TransactionInstruction>;
 }

package/lib/browser/adminClient.js

@@ -2103,36 +2103,36 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
-    async updateDisableBitFlagsMMOracle(disable) {
-        const updateDisableBitFlagsMMOracleIx = await this.getUpdateDisableBitFlagsMMOracleIx(disable);
-        const tx = await this.buildTransaction(updateDisableBitFlagsMMOracleIx);
+    async zeroMMOracleFields(marketIndex) {
+        const zeroMMOracleFieldsIx = await this.getZeroMMOracleFieldsIx(marketIndex);
+        const tx = await this.buildTransaction(zeroMMOracleFieldsIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getUpdateDisableBitFlagsMMOracleIx(disable) {
-        return await this.program.instruction.updateDisableBitflagsMmOracle(disable, {
+    async getZeroMMOracleFieldsIx(marketIndex) {
+        return await this.program.instruction.zeroMmOracleFields({
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex),
             },
         });
     }
-    async zeroMMOracleFields(marketIndex) {
-        const zeroMMOracleFieldsIx = await this.getZeroMMOracleFieldsIx(marketIndex);
-        const tx = await this.buildTransaction(zeroMMOracleFieldsIx);
+    async updateFeatureBitFlagsMMOracle(enable) {
+        const updateFeatureBitFlagsMMOracleIx = await this.getUpdateFeatureBitFlagsMMOracleIx(enable);
+        const tx = await this.buildTransaction(updateFeatureBitFlagsMMOracleIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getZeroMMOracleFieldsIx(marketIndex) {
-        return await this.program.instruction.zeroMmOracleFields({
+    async getUpdateFeatureBitFlagsMMOracleIx(enable) {
+        return await this.program.instruction.updateFeatureBitFlagsMmOracle(enable, {
             accounts: {
-                admin: this.isSubscribed
-                    ? this.getStateAccount().admin
-                    : this.wallet.publicKey,
+                admin: this.useHotWalletAdmin
+                    ? this.wallet.publicKey
+                    : this.getStateAccount().admin,
                 state: await this.getStatePublicKey(),
-                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex),
             },
         });
     }

package/lib/browser/dlob/DLOB.d.ts

@@ -75,8 +75,8 @@ export declare class DLOB {
      * @returns a promise that resolves when the DLOB is initialized
      */
     initFromUserMap(userMap: UserMap, slot: number): Promise<boolean>;
-    insertOrder(order: Order, userAccount: string, slot: number, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
-    insertSignedMsgOrder(order: Order, userAccount: string, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
+    insertOrder(order: Order, userAccount: string, slot: number, isUserProtectedMaker: boolean, baseAssetAmount: BN, onInsert?: OrderBookCallback): void;
+    insertSignedMsgOrder(order: Order, userAccount: string, isUserProtectedMaker: boolean, baseAssetAmount?: BN, onInsert?: OrderBookCallback): void;
     addOrderList(marketType: MarketTypeStr, marketIndex: number): void;
     delete(order: Order, userAccount: PublicKey, slot: number, isUserProtectedMaker: boolean, onDelete?: OrderBookCallback): void;
     getListForOnChainOrder(order: Order, slot: number, isProtectedMaker: boolean): NodeList<any> | undefined;
@@ -133,7 +133,7 @@ export declare class DLOB {
     getTakeProfits(marketIndex: number, marketType: MarketType, direction: PositionDirection): Generator<DLOBNode>;
     getTakeProfitMarkets(marketIndex: number, marketType: MarketType, direction: PositionDirection): Generator<DLOBNode>;
     getTakeProfitLimits(marketIndex: number, marketType: MarketType, direction: PositionDirection): Generator<DLOBNode>;
-    findNodesToTrigger(marketIndex: number, slot: number, oraclePrice: BN, marketType: MarketType, stateAccount: StateAccount): NodeToTrigger[];
+    findNodesToTrigger(marketIndex: number, slot: number, triggerPrice: BN, marketType: MarketType, stateAccount: StateAccount): NodeToTrigger[];
     printTop(driftClient: DriftClient, slotSubscriber: SlotSubscriber, marketIndex: number, marketType: MarketType): void;
     getDLOBOrders(): DLOBOrders;
     getNodeLists(): Generator<NodeList<DLOBNodeType>>;

package/lib/browser/dlob/DLOB.js

@@ -65,6 +65,7 @@ class DLOB {
      * @returns a promise that resolves when the DLOB is initialized
      */
     async initFromUserMap(userMap, slot) {
+        var _a;
         if (this.initialized) {
             return false;
         }
@@ -75,13 +76,18 @@ class DLOB {
             const userAccountPubkeyString = userAccountPubkey.toString();
             const protectedMaker = (0, userStatus_1.isUserProtectedMaker)(userAccount);
             for (const order of userAccount.orders) {
-                this.insertOrder(order, userAccountPubkeyString, slot, protectedMaker);
+                let baseAssetAmount = order.baseAssetAmount;
+                if (order.reduceOnly) {
+                    const existingBaseAmount = ((_a = userAccount.perpPositions.find((pos) => pos.marketIndex === order.marketIndex && pos.openOrders > 0)) === null || _a === void 0 ? void 0 : _a.baseAssetAmount) || numericConstants_1.ZERO;
+                    baseAssetAmount = (0, orders_1.calculateOrderBaseAssetAmount)(order, existingBaseAmount);
+                }
+                this.insertOrder(order, userAccountPubkeyString, slot, protectedMaker, baseAssetAmount);
             }
         }
         this.initialized = true;
         return true;
     }
-    insertOrder(order, userAccount, slot, isUserProtectedMaker, onInsert) {
+    insertOrder(order, userAccount, slot, isUserProtectedMaker, baseAssetAmount, onInsert) {
         var _a;
         if (!(0, types_1.isVariant)(order.status, 'open')) {
             return;
@@ -98,12 +104,12 @@ class DLOB {
                 .get(marketType)
                 .add((0, NodeList_1.getOrderSignature)(order.orderId, userAccount));
         }
-        (_a = this.getListForOnChainOrder(order, slot, isUserProtectedMaker)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerParamsMap[marketType].get(order.marketIndex));
+        (_a = this.getListForOnChainOrder(order, slot, isUserProtectedMaker)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerParamsMap[marketType].get(order.marketIndex), baseAssetAmount);
         if (onInsert) {
             onInsert();
         }
     }
-    insertSignedMsgOrder(order, userAccount, isUserProtectedMaker, onInsert) {
+    insertSignedMsgOrder(order, userAccount, isUserProtectedMaker, baseAssetAmount, onInsert) {
         const marketType = (0, types_1.getVariant)(order.marketType);
         const marketIndex = order.marketIndex;
         const bidOrAsk = (0, types_1.isVariant)(order.direction, 'long') ? 'bid' : 'ask';
@@ -116,7 +122,7 @@ class DLOB {
         this.orderLists
             .get(marketType)
             .get(marketIndex)
-            .signedMsg[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerParamsMap[marketType].get(order.marketIndex));
+            .signedMsg[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerParamsMap[marketType].get(order.marketIndex), baseAssetAmount);
         if (onInsert) {
             onInsert();
         }
@@ -847,7 +853,7 @@ class DLOB {
             }
         }
     }
-    findNodesToTrigger(marketIndex, slot, oraclePrice, marketType, stateAccount) {
+    findNodesToTrigger(marketIndex, slot, triggerPrice, marketType, stateAccount) {
         if ((0, exchangeStatus_1.exchangePaused)(stateAccount)) {
             return [];
         }
@@ -859,7 +865,7 @@ class DLOB {
             : undefined;
         if (triggerAboveList) {
             for (const node of triggerAboveList.getGenerator()) {
-                if (oraclePrice.gt(node.order.triggerPrice)) {
+                if (triggerPrice.gt(node.order.triggerPrice)) {
                     nodesToTrigger.push({
                         node: node,
                     });
@@ -874,7 +880,7 @@ class DLOB {
             : undefined;
         if (triggerBelowList) {
             for (const node of triggerBelowList.getGenerator()) {
-                if (oraclePrice.lt(node.order.triggerPrice)) {
+                if (triggerPrice.lt(node.order.triggerPrice)) {
                     nodesToTrigger.push({
                         node: node,
                     });

package/lib/browser/dlob/DLOBNode.d.ts

@@ -12,6 +12,7 @@ export interface DLOBNode {
     isProtectedMaker: boolean;
     protectedMakerParams?: ProtectedMakerParams;
     isSignedMsg: boolean | undefined;
+    baseAssetAmount: BN;
 }
 export declare abstract class OrderNode implements DLOBNode {
     order: Order;
@@ -21,8 +22,9 @@ export declare abstract class OrderNode implements DLOBNode {
     haveTrigger: boolean;
     isProtectedMaker: boolean;
     protectedMakerParams?: ProtectedMakerParams;
+    baseAssetAmount: BN;
     isSignedMsg: boolean;
-    constructor(order: Order, userAccount: string, isProtectedMaker: boolean, protectedMakerParams?: ProtectedMakerParams, isSignedMsg?: boolean);
+    constructor(order: Order, userAccount: string, isProtectedMaker: boolean, protectedMakerParams?: ProtectedMakerParams, baseAssetAmount?: BN, isSignedMsg?: boolean);
     abstract getSortValue(order: Order): BN;
     getLabel(): string;
     getPrice(oraclePriceData: OraclePriceData, slot: number): BN;
@@ -57,7 +59,7 @@ export declare class TriggerOrderNode extends OrderNode {
 export declare class SignedMsgOrderNode extends OrderNode {
     next?: SignedMsgOrderNode;
     previous?: SignedMsgOrderNode;
-    constructor(order: Order, userAccount: string);
+    constructor(order: Order, userAccount: string, baseAssetAmount?: BN);
     getSortValue(order: Order): BN;
 }
 export type DLOBNodeMap = {
@@ -70,4 +72,4 @@ export type DLOBNodeMap = {
     signedMsg: SignedMsgOrderNode;
 };
 export type DLOBNodeType = 'signedMsg' | 'restingLimit' | 'takingLimit' | 'floatingLimit' | 'protectedFloatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
-export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: string, isProtectedMaker: boolean, protectedMakerParams?: ProtectedMakerParams): DLOBNodeMap[T];
+export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: string, isProtectedMaker: boolean, protectedMakerParams?: ProtectedMakerParams, baseAssetAmount?: BN): DLOBNodeMap[T];

package/lib/browser/dlob/DLOBNode.js

@@ -8,7 +8,7 @@ const types_1 = require("../types");
 const conversion_1 = require("../math/conversion");
 const NodeList_1 = require("./NodeList");
 class OrderNode {
-    constructor(order, userAccount, isProtectedMaker, protectedMakerParams, isSignedMsg = false) {
+    constructor(order, userAccount, isProtectedMaker, protectedMakerParams, baseAssetAmount, isSignedMsg = false) {
         this.haveFilled = false;
         this.haveTrigger = false;
         // Copy the order over to the node
@@ -17,6 +17,7 @@ class OrderNode {
         this.sortValue = this.getSortValue(order);
         this.isProtectedMaker = isProtectedMaker;
         this.protectedMakerParams = protectedMakerParams;
+        this.baseAssetAmount = baseAssetAmount !== null && baseAssetAmount !== void 0 ? baseAssetAmount : order.baseAssetAmount;
         this.isSignedMsg = isSignedMsg;
     }
     getLabel() {
@@ -85,30 +86,30 @@ class TriggerOrderNode extends OrderNode {
 exports.TriggerOrderNode = TriggerOrderNode;
 // We'll use the signedMsg uuid for the order id since it's not yet on-chain
 class SignedMsgOrderNode extends OrderNode {
-    constructor(order, userAccount) {
-        super(order, userAccount, false, undefined, true);
+    constructor(order, userAccount, baseAssetAmount) {
+        super(order, userAccount, false, undefined, baseAssetAmount, true);
     }
     getSortValue(order) {
         return order.slot;
     }
 }
 exports.SignedMsgOrderNode = SignedMsgOrderNode;
-function createNode(nodeType, order, userAccount, isProtectedMaker, protectedMakerParams) {
+function createNode(nodeType, order, userAccount, isProtectedMaker, protectedMakerParams, baseAssetAmount) {
     switch (nodeType) {
         case 'floatingLimit':
-            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
+            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams, baseAssetAmount);
         case 'protectedFloatingLimit':
-            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
+            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams, baseAssetAmount);
         case 'restingLimit':
-            return new RestingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
+            return new RestingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams, baseAssetAmount);
         case 'takingLimit':
-            return new TakingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
+            return new TakingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams, baseAssetAmount);
         case 'market':
-            return new MarketOrderNode(order, userAccount, isProtectedMaker, undefined);
+            return new MarketOrderNode(order, userAccount, isProtectedMaker, undefined, baseAssetAmount);
         case 'trigger':
-            return new TriggerOrderNode(order, userAccount, isProtectedMaker, undefined);
+            return new TriggerOrderNode(order, userAccount, isProtectedMaker, undefined, baseAssetAmount);
         case 'signedMsg':
-            return new SignedMsgOrderNode(order, userAccount);
+            return new SignedMsgOrderNode(order, userAccount, baseAssetAmount);
         default:
             throw Error(`Unknown DLOBNode type ${nodeType}`);
     }

package/lib/browser/dlob/DLOBSubscriber.js

@@ -83,7 +83,7 @@ class DLOBSubscriber {
             fallbackL2Generators = [
                 (0, orderBookLevels_1.getVammL2Generator)({
                     marketAccount: this.driftClient.getPerpMarketAccount(marketIndex),
-                    oraclePriceData,
+                    oraclePriceData: this.driftClient.getMMOracleDataForPerpMarket(marketIndex),
                     numOrders: numVammOrders !== null && numVammOrders !== void 0 ? numVammOrders : depth,
                     topOfBookQuoteAmounts: marketIndex < 3
                         ? orderBookLevels_1.MAJORS_TOP_OF_BOOK_QUOTE_AMOUNTS

package/lib/browser/dlob/NodeList.d.ts

@@ -1,5 +1,7 @@
+/// <reference types="bn.js" />
 import { MarketTypeStr, Order, ProtectedMakerParams } from '../types';
 import { DLOBNode, DLOBNodeMap } from './DLOBNode';
+import { BN } from '@coral-xyz/anchor';
 export type SortDirection = 'asc' | 'desc';
 export declare function getOrderSignature(orderId: number, userAccount: string): string;
 export interface DLOBNodeGenerator {
@@ -13,7 +15,7 @@ export declare class NodeList<NodeType extends keyof DLOBNodeMap> implements DLO
     nodeMap: Map<string, DLOBNodeMap[NodeType]>;
     constructor(nodeType: NodeType, sortDirection: SortDirection);
     clear(): void;
-    insert(order: Order, marketType: MarketTypeStr, userAccount: string, isProtectedMaker: boolean, protectedMakerParamsMap?: ProtectedMakerParams): void;
+    insert(order: Order, marketType: MarketTypeStr, userAccount: string, isProtectedMaker: boolean, protectedMakerParamsMap?: ProtectedMakerParams, baseAssetAmount?: BN): void;
     prependNode(currentNode: DLOBNodeMap[NodeType], newNode: DLOBNodeMap[NodeType]): boolean;
     update(order: Order, userAccount: string): void;
     remove(order: Order, userAccount: string): void;

package/lib/browser/dlob/NodeList.js

@@ -19,11 +19,11 @@ class NodeList {
         this.length = 0;
         this.nodeMap.clear();
     }
-    insert(order, marketType, userAccount, isProtectedMaker, protectedMakerParamsMap) {
+    insert(order, marketType, userAccount, isProtectedMaker, protectedMakerParamsMap, baseAssetAmount) {
         if (!(0, types_1.isVariant)(order.status, 'open')) {
             return;
         }
-        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount, isProtectedMaker, protectedMakerParamsMap);
+        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount, isProtectedMaker, protectedMakerParamsMap, baseAssetAmount);
         const orderSignature = getOrderSignature(order.orderId, userAccount);
         if (this.nodeMap.has(orderSignature)) {
             return;

package/lib/browser/dlob/orderBookLevels.d.ts

@@ -34,6 +34,12 @@ export type L3OrderBook = {
 };
 export declare const DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS: BN[];
 export declare const MAJORS_TOP_OF_BOOK_QUOTE_AMOUNTS: BN[];
+/**
+ * Get an {@link Generator<L2Level>} generator from a {@link Generator<DLOBNode>}
+ * @param dlobNodes e.g. {@link DLOB#getRestingLimitAsks} or {@link DLOB#getRestingLimitBids}
+ * @param oraclePriceData
+ * @param slot
+ */
 export declare function getL2GeneratorFromDLOBNodes(dlobNodes: Generator<DLOBNode>, oraclePriceData: OraclePriceData, slot: number): Generator<L2Level>;
 export declare function mergeL2LevelGenerators(l2LevelGenerators: Generator<L2Level>[], compare: (a: L2Level, b: L2Level) => boolean): Generator<L2Level>;
 export declare function createL2Levels(generator: Generator<L2Level>, depth: number): L2Level[];

package/lib/browser/dlob/orderBookLevels.js

@@ -19,16 +19,19 @@ exports.MAJORS_TOP_OF_BOOK_QUOTE_AMOUNTS = [
     new anchor_1.BN(20000).mul(numericConstants_1.QUOTE_PRECISION),
     new anchor_1.BN(50000).mul(numericConstants_1.QUOTE_PRECISION),
 ];
+const INDICATIVE_QUOTES_PUBKEY = 'inDNdu3ML4vG5LNExqcwuCQtLcCU8KfK5YM2qYV3JJz';
 /**
  * Get an {@link Generator<L2Level>} generator from a {@link Generator<DLOBNode>}
  * @param dlobNodes e.g. {@link DLOB#getRestingLimitAsks} or {@link DLOB#getRestingLimitBids}
  * @param oraclePriceData
  * @param slot
  */
-const INDICATIVE_QUOTES_PUBKEY = 'inDNdu3ML4vG5LNExqcwuCQtLcCU8KfK5YM2qYV3JJz';
 function* getL2GeneratorFromDLOBNodes(dlobNodes, oraclePriceData, slot) {
     for (const dlobNode of dlobNodes) {
-        const size = dlobNode.order.baseAssetAmount.sub(dlobNode.order.baseAssetAmountFilled);
+        const size = dlobNode.baseAssetAmount.sub(dlobNode.order.baseAssetAmountFilled);
+        if (size.lte(numericConstants_1.ZERO)) {
+            continue;
+        }
         yield {
             size,
             price: dlobNode.getPrice(oraclePriceData, slot),

package/lib/browser/driftClient.js

@@ -4417,15 +4417,27 @@ class DriftClient {
         this.eventEmitter.emit(eventName, data);
     }
     getOracleDataForPerpMarket(marketIndex) {
-        return this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(marketIndex).data;
+        const perpMarket = this.getPerpMarketAccount(marketIndex);
+        const isMMOracleActive = !perpMarket.amm.mmOracleSlot.eq(numericConstants_1.ZERO);
+        return {
+            ...this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(marketIndex).data,
+            isMMOracleActive,
+        };
     }
     getMMOracleDataForPerpMarket(marketIndex) {
         const perpMarket = this.getPerpMarketAccount(marketIndex);
         const oracleData = this.getOracleDataForPerpMarket(marketIndex);
         const stateAccountAndSlot = this.accountSubscriber.getStateAccountAndSlot();
+        const pctDiff = perpMarket.amm.mmOraclePrice
+            .sub(oracleData.price)
+            .abs()
+            .mul(numericConstants_1.PERCENTAGE_PRECISION)
+            .div(anchor_1.BN.max(oracleData.price, numericConstants_1.ONE));
         if (!(0, oracles_1.isOracleValid)(perpMarket, oracleData, stateAccountAndSlot.data.oracleGuardRails, stateAccountAndSlot.slot) ||
             perpMarket.amm.mmOraclePrice.eq(numericConstants_1.ZERO) ||
-            perpMarket.amm.mmOracleSlot < oracleData.slot) {
+            perpMarket.amm.mmOracleSlot < oracleData.slot ||
+            pctDiff.gt(numericConstants_1.PERCENTAGE_PRECISION.divn(100)) // 1% threshold
+        ) {
             return { ...oracleData, fetchedWithMMOracle: true };
         }
         else {
@@ -4440,6 +4452,7 @@ class DriftClient {
                 confidence: conf,
                 hasSufficientNumberOfDataPoints: true,
                 fetchedWithMMOracle: true,
+                isMMOracleActive: oracleData.isMMOracleActive,
             };
         }
     }