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

package/lib/browser/accounts/{driftClientAccount/webSocketDriftClientAccountSubscriber.js → webSocketDriftClientAccountSubscriber.js}

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketDriftClientAccountSubscriber = void 0;
-const types_1 = require("../types");
+const types_1 = require("./types");
 const events_1 = require("events");
-const pda_1 = require("../../addresses/pda");
-const webSocketAccountSubscriber_1 = require("../baseSubscribers/webSocketAccountSubscriber");
+const pda_1 = require("../addresses/pda");
+const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 const web3_js_1 = require("@solana/web3.js");
-const oracleClientCache_1 = require("../../oracles/oracleClientCache");
-const quoteAssetOracleClient_1 = require("../../oracles/quoteAssetOracleClient");
-const config_1 = require("../../config");
-const utils_1 = require("../utils");
-const oracleId_1 = require("../../oracles/oracleId");
-const types_2 = require("../../types");
+const oracleClientCache_1 = require("../oracles/oracleClientCache");
+const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
+const config_1 = require("../config");
+const utils_1 = require("./utils");
+const oracleId_1 = require("../oracles/oracleId");
+const types_2 = require("../types");
 const ORACLE_DEFAULT_ID = (0, oracleId_1.getOracleId)(web3_js_1.PublicKey.default, types_2.OracleSource.QUOTE_ASSET);
 class WebSocketDriftClientAccountSubscriber {
     constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts, commitment) {

package/lib/browser/accounts/{highLeverageModeConfigAccount/webSocketHighLeverageModeConfigAccountSubscriber.d.ts → webSocketHighLeverageModeConfigAccountSubscriber.d.ts}

@@ -1,10 +1,10 @@
 /// <reference types="node" />
-import { DataAndSlot, AccountSubscriber, HighLeverageModeConfigAccountEvents, HighLeverageModeConfigAccountSubscriber } from '../types';
+import { DataAndSlot, AccountSubscriber, HighLeverageModeConfigAccountEvents, HighLeverageModeConfigAccountSubscriber } 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 { HighLeverageModeConfig } from '../../types';
+import { HighLeverageModeConfig } from '../types';
 export declare class WebSocketHighLeverageModeConfigAccountSubscriber implements HighLeverageModeConfigAccountSubscriber {
     isSubscribed: boolean;
     resubTimeoutMs?: number;

package/lib/browser/accounts/{highLeverageModeConfigAccount/webSocketHighLeverageModeConfigAccountSubscriber.js → webSocketHighLeverageModeConfigAccountSubscriber.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketHighLeverageModeConfigAccountSubscriber = void 0;
-const types_1 = require("../types");
+const types_1 = require("./types");
 const events_1 = require("events");
-const webSocketAccountSubscriber_1 = require("../baseSubscribers/webSocketAccountSubscriber");
+const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketHighLeverageModeConfigAccountSubscriber {
     constructor(program, highLeverageModeConfigAccountPublicKey, resubTimeoutMs, commitment) {
         this.isSubscribed = false;

package/lib/browser/accounts/{insuranceFundStakeAccount/webSocketInsuranceFundStakeAccountSubscriber.d.ts → webSocketInsuranceFundStakeAccountSubscriber.d.ts}

@@ -1,10 +1,10 @@
 /// <reference types="node" />
-import { DataAndSlot, AccountSubscriber, InsuranceFundStakeAccountEvents, InsuranceFundStakeAccountSubscriber } from '../types';
+import { DataAndSlot, AccountSubscriber, InsuranceFundStakeAccountEvents, InsuranceFundStakeAccountSubscriber } 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 { InsuranceFundStake } from '../../types';
+import { InsuranceFundStake } from '../types';
 export declare class WebSocketInsuranceFundStakeAccountSubscriber implements InsuranceFundStakeAccountSubscriber {
     isSubscribed: boolean;
     resubTimeoutMs?: number;

package/lib/browser/accounts/{insuranceFundStakeAccount/webSocketInsuranceFundStakeAccountSubscriber.js → webSocketInsuranceFundStakeAccountSubscriber.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketInsuranceFundStakeAccountSubscriber = void 0;
-const types_1 = require("../types");
+const types_1 = require("./types");
 const events_1 = require("events");
-const webSocketAccountSubscriber_1 = require("../baseSubscribers/webSocketAccountSubscriber");
+const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketInsuranceFundStakeAccountSubscriber {
     constructor(program, insuranceFundStakeAccountPublicKey, resubTimeoutMs, commitment) {
         this.isSubscribed = false;

package/lib/browser/accounts/{programAccount/webSocketProgramAccountSubscriber.d.ts → webSocketProgramAccountSubscriber.d.ts}

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from '../types';
+import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { Commitment, Context, KeyedAccountInfo, MemcmpFilter, PublicKey } from '@solana/web3.js';
 export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAccountSubscriber<T> {

package/lib/browser/accounts/{userAccount/webSocketUserAccountSubscriber.d.ts → webSocketUserAccountSubscriber.d.ts}

@@ -1,10 +1,10 @@
 /// <reference types="node" />
-import { DataAndSlot, AccountSubscriber, UserAccountEvents, UserAccountSubscriber, ResubOpts } from '../types';
+import { DataAndSlot, AccountSubscriber, UserAccountEvents, UserAccountSubscriber, ResubOpts } 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 { UserAccount } from '../../types';
+import { UserAccount } from '../types';
 export declare class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
     resubOpts?: ResubOpts;

package/lib/{node/accounts/userAccount → browser/accounts}/webSocketUserAccountSubscriber.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketUserAccountSubscriber = void 0;
-const types_1 = require("../types");
+const types_1 = require("./types");
 const events_1 = require("events");
-const webSocketAccountSubscriber_1 = require("../baseSubscribers/webSocketAccountSubscriber");
+const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserAccountSubscriber {
     constructor(program, userAccountPublicKey, resubOpts, commitment) {
         this.isSubscribed = false;

package/lib/browser/accounts/{userStatsAccount/webSocketUserStatsAccountSubsriber.d.ts → webSocketUserStatsAccountSubsriber.d.ts}

@@ -1,10 +1,10 @@
 /// <reference types="node" />
-import { DataAndSlot, AccountSubscriber, UserStatsAccountSubscriber, UserStatsAccountEvents, ResubOpts } from '../types';
+import { DataAndSlot, AccountSubscriber, UserStatsAccountSubscriber, UserStatsAccountEvents, ResubOpts } 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 { UserStatsAccount } from '../../types';
+import { UserStatsAccount } from '../types';
 export declare class WebSocketUserStatsAccountSubscriber implements UserStatsAccountSubscriber {
     isSubscribed: boolean;
     resubOpts?: ResubOpts;

package/lib/browser/accounts/{userStatsAccount/webSocketUserStatsAccountSubsriber.js → webSocketUserStatsAccountSubsriber.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketUserStatsAccountSubscriber = void 0;
-const types_1 = require("../types");
+const types_1 = require("./types");
 const events_1 = require("events");
-const webSocketAccountSubscriber_1 = require("../baseSubscribers/webSocketAccountSubscriber");
+const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserStatsAccountSubscriber {
     constructor(program, userStatsAccountPublicKey, resubOpts, commitment) {
         this.isSubscribed = false;

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/auctionSubscriber/auctionSubscriber.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuctionSubscriber = void 0;
 const memcmp_1 = require("../memcmp");
 const events_1 = require("events");
-const webSocketProgramAccountSubscriber_1 = require("../accounts/programAccount/webSocketProgramAccountSubscriber");
+const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class AuctionSubscriber {
     constructor({ driftClient, opts, resubTimeoutMs, logResubMessages, }) {
         this.driftClient = driftClient;

package/lib/browser/auctionSubscriber/auctionSubscriberGrpc.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuctionSubscriberGrpc = void 0;
 const memcmp_1 = require("../memcmp");
 const events_1 = require("events");
-const grpcProgramAccountSubscriber_1 = require("../accounts/programAccount/grpcProgramAccountSubscriber");
+const grpcProgramAccountSubscriber_1 = require("../accounts/grpcProgramAccountSubscriber");
 class AuctionSubscriberGrpc {
     constructor({ driftClient, opts, grpcConfigs, resubTimeoutMs, logResubMessages, }) {
         this.driftClient = driftClient;

package/lib/browser/{config/index.d.ts → config.d.ts}

@@ -1,10 +1,9 @@
 import { ConfirmOptions, PublicKey } from '@solana/web3.js';
-import { PerpMarketAccount, SpotMarketAccount } from '../types';
-import { PerpMarketConfig } from '../constants/perpMarkets';
-import { SpotMarketConfig } from '../constants/spotMarkets';
-import { OracleInfo } from '../oracles/types';
+import { PerpMarketAccount, SpotMarketAccount } from './types';
+import { PerpMarketConfig } from './constants/perpMarkets';
+import { SpotMarketConfig } from './constants/spotMarkets';
+import { OracleInfo } from './oracles/types';
 import { Program } from '@coral-xyz/anchor';
-import { DriftEnv } from './types';
 type DriftConfig = {
     ENV: DriftEnv;
     PYTH_ORACLE_MAPPING_ADDRESS: string;
@@ -25,6 +24,7 @@ type DriftConfig = {
     PYTH_PULL_ORACLE_LOOKUP_TABLE?: string;
     SB_ON_DEMAND_PID: PublicKey;
 };
+export type DriftEnv = 'devnet' | 'mainnet-beta';
 export declare const DRIFT_PROGRAM_ID = "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH";
 export declare const DRIFT_ORACLE_RECEIVER_ID = "G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha";
 export declare const PTYH_LAZER_PROGRAM_ID = "pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt";

package/lib/{node/config/index.js → browser/config.js}

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAllMarketAndOracles = exports.getMarketsAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = exports.DEFAULT_CONFIRMATION_OPTS = exports.PYTH_LAZER_STORAGE_ACCOUNT_KEY = exports.PTYH_LAZER_PROGRAM_ID = exports.DRIFT_ORACLE_RECEIVER_ID = exports.DRIFT_PROGRAM_ID = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const perpMarkets_1 = require("../constants/perpMarkets");
-const spotMarkets_1 = require("../constants/spotMarkets");
+const perpMarkets_1 = require("./constants/perpMarkets");
+const spotMarkets_1 = require("./constants/spotMarkets");
 const on_demand_1 = require("@switchboard-xyz/on-demand");
-const oracleId_1 = require("../oracles/oracleId");
+const oracleId_1 = require("./oracles/oracleId");
 exports.DRIFT_PROGRAM_ID = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 exports.DRIFT_ORACLE_RECEIVER_ID = 'G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha';
 exports.PTYH_LAZER_PROGRAM_ID = 'pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt';

package/lib/browser/constants/perpMarkets.d.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;
     category?: string[];

package/lib/browser/constants/spotMarkets.d.ts

@@ -2,7 +2,7 @@
 import { PublicKey } from '@solana/web3.js';
 import { OracleSource } from '../types';
 import { BN } from '@coral-xyz/anchor';
-import { DriftEnv } from '../config/types';
+import { DriftEnv } from '../config';
 export type SpotMarketConfig = {
     symbol: string;
     marketIndex: number;

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DLOB = void 0;
 const NodeList_1 = require("./NodeList");
-const utils_1 = require("./utils");
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const userName_1 = require("../userName");
@@ -66,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;
         }
@@ -76,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;
@@ -97,14 +102,14 @@ class DLOB {
         if ((0, types_1.isVariant)(order.status, 'open')) {
             this.openOrders
                 .get(marketType)
-                .add((0, utils_1.getOrderSignature)(order.orderId, userAccount));
+                .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';
@@ -113,11 +118,11 @@ class DLOB {
         }
         this.openOrders
             .get(marketType)
-            .add((0, utils_1.getOrderSignature)(order.orderId, userAccount));
+            .add((0, NodeList_1.getOrderSignature)(order.orderId, userAccount));
         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();
         }
@@ -231,7 +236,7 @@ class DLOB {
         }
     }
     getOrder(orderId, userAccount) {
-        const orderSignature = (0, utils_1.getOrderSignature)(orderId, userAccount.toString());
+        const orderSignature = (0, NodeList_1.getOrderSignature)(orderId, userAccount.toString());
         for (const nodeList of this.getNodeLists()) {
             const node = nodeList.get(orderSignature);
             if (node) {
@@ -281,7 +286,7 @@ class DLOB {
         const mergedNodesToFill = new Map();
         const mergeNodesToFillHelper = (nodesToFillArray) => {
             nodesToFillArray.forEach((nodeToFill) => {
-                const nodeSignature = (0, utils_1.getOrderSignature)(nodeToFill.node.order.orderId, nodeToFill.node.userAccount);
+                const nodeSignature = (0, NodeList_1.getOrderSignature)(nodeToFill.node.order.orderId, nodeToFill.node.userAccount);
                 if (!mergedNodesToFill.has(nodeSignature)) {
                     mergedNodesToFill.set(nodeSignature, {
                         node: nodeToFill.node,
@@ -848,7 +853,7 @@ class DLOB {
             }
         }
     }
-    findNodesToTrigger(marketIndex, slot, oraclePrice, marketType, stateAccount) {
+    findNodesToTrigger(marketIndex, slot, triggerPrice, marketType, stateAccount) {
         if ((0, exchangeStatus_1.exchangePaused)(stateAccount)) {
             return [];
         }
@@ -860,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,
                     });
@@ -875,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

@@ -6,9 +6,9 @@ const numericConstants_1 = require("../constants/numericConstants");
 const orders_1 = require("../math/orders");
 const types_1 = require("../types");
 const conversion_1 = require("../math/conversion");
-const utils_1 = require("./utils");
+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,10 +17,11 @@ 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() {
-        let msg = `Order ${(0, utils_1.getOrderSignature)(this.order.orderId, this.userAccount)}`;
+        let msg = `Order ${(0, NodeList_1.getOrderSignature)(this.order.orderId, this.userAccount)}`;
         msg += ` ${(0, types_1.isVariant)(this.order.direction, 'long') ? 'LONG' : 'SHORT'} `;
         msg += `${(0, conversion_1.convertToNumber)(this.order.baseAssetAmount, numericConstants_1.AMM_RESERVE_PRECISION).toFixed(3)}`;
         if (this.order.price.gt(numericConstants_1.ZERO)) {
@@ -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,6 +1,9 @@
+/// <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 {
     getGenerator(): Generator<DLOBNode>;
 }
@@ -12,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

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NodeList = void 0;
+exports.NodeList = exports.getOrderSignature = void 0;
 const types_1 = require("../types");
 const DLOBNode_1 = require("./DLOBNode");
-const utils_1 = require("./utils");
+function getOrderSignature(orderId, userAccount) {
+    return `${userAccount.toString()}-${orderId.toString()}`;
+}
+exports.getOrderSignature = getOrderSignature;
 class NodeList {
     constructor(nodeType, sortDirection) {
         this.nodeType = nodeType;
@@ -16,12 +19,12 @@ 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 orderSignature = (0, utils_1.getOrderSignature)(order.orderId, userAccount);
+        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;
         }
@@ -65,7 +68,7 @@ class NodeList {
         }
     }
     update(order, userAccount) {
-        const orderId = (0, utils_1.getOrderSignature)(order.orderId, userAccount);
+        const orderId = getOrderSignature(order.orderId, userAccount);
         if (this.nodeMap.has(orderId)) {
             const node = this.nodeMap.get(orderId);
             Object.assign(node.order, order);
@@ -73,7 +76,7 @@ class NodeList {
         }
     }
     remove(order, userAccount) {
-        const orderId = (0, utils_1.getOrderSignature)(order.orderId, userAccount);
+        const orderId = getOrderSignature(order.orderId, userAccount);
         if (this.nodeMap.has(orderId)) {
             const node = this.nodeMap.get(orderId);
             if (node.next) {
@@ -99,7 +102,7 @@ class NodeList {
         }
     }
     has(order, userAccount) {
-        return this.nodeMap.has((0, utils_1.getOrderSignature)(order.orderId, userAccount));
+        return this.nodeMap.has(getOrderSignature(order.orderId, userAccount));
     }
     get(orderSignature) {
         return this.nodeMap.get(orderSignature);

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[];