@drift-labs/sdk 2.20.0-beta.0 → 2.20.0-beta.1

package/lib/dlob/DLOB.js

@@ -80,10 +80,10 @@ class DLOB {
         this.insertOrder(record.order, record.user, slot);
     }
     handleOrderActionRecord(record, slot) {
-        if (__1.isOneOfVariant(record.action, ['place', 'expire'])) {
+        if ((0, __1.isOneOfVariant)(record.action, ['place', 'expire'])) {
             return;
         }
-        if (__1.isVariant(record.action, 'trigger')) {
+        if ((0, __1.isVariant)(record.action, 'trigger')) {
             if (record.taker !== null) {
                 const takerOrder = this.getOrder(record.takerOrderId, record.taker);
                 if (takerOrder) {
@@ -97,7 +97,7 @@ class DLOB {
                 }
             }
         }
-        else if (__1.isVariant(record.action, 'fill')) {
+        else if ((0, __1.isVariant)(record.action, 'fill')) {
             if (record.taker !== null) {
                 const takerOrder = this.getOrder(record.takerOrderId, record.taker);
                 if (takerOrder) {
@@ -111,7 +111,7 @@ class DLOB {
                 }
             }
         }
-        else if (__1.isVariant(record.action, 'cancel')) {
+        else if ((0, __1.isVariant)(record.action, 'cancel')) {
             if (record.taker !== null) {
                 const takerOrder = this.getOrder(record.takerOrderId, record.taker);
                 if (takerOrder) {
@@ -128,20 +128,20 @@ class DLOB {
     }
     insertOrder(order, userAccount, slot, onInsert) {
         var _a;
-        if (__1.isVariant(order.status, 'init')) {
+        if ((0, __1.isVariant)(order.status, 'init')) {
             return;
         }
-        if (!__1.isOneOfVariant(order.orderType, SUPPORTED_ORDER_TYPES)) {
+        if (!(0, __1.isOneOfVariant)(order.orderType, SUPPORTED_ORDER_TYPES)) {
             return;
         }
-        const marketType = __1.getVariant(order.marketType);
+        const marketType = (0, __1.getVariant)(order.marketType);
         if (!this.orderLists.get(marketType).has(order.marketIndex)) {
             this.addOrderList(marketType, order.marketIndex);
         }
-        if (__1.isVariant(order.status, 'open')) {
+        if ((0, __1.isVariant)(order.status, 'open')) {
             this.openOrders
                 .get(marketType)
-                .add(NodeList_1.getOrderSignature(order.orderId, userAccount));
+                .add((0, NodeList_1.getOrderSignature)(order.orderId, userAccount));
         }
         (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount);
         if (onInsert) {
@@ -193,16 +193,16 @@ class DLOB {
     }
     trigger(order, userAccount, slot, onTrigger) {
         var _a;
-        if (__1.isVariant(order.status, 'init')) {
+        if ((0, __1.isVariant)(order.status, 'init')) {
             return;
         }
         this.updateRestingLimitOrders(slot);
-        if (__1.isTriggered(order)) {
+        if ((0, __1.isTriggered)(order)) {
             return;
         }
-        const marketType = __1.getVariant(order.marketType);
+        const marketType = (0, __1.getVariant)(order.marketType);
         const triggerList = this.orderLists.get(marketType).get(order.marketIndex)
-            .trigger[__1.isVariant(order.triggerCondition, 'above') ? 'above' : 'below'];
+            .trigger[(0, __1.isVariant)(order.triggerCondition, 'above') ? 'above' : 'below'];
         triggerList.remove(order, userAccount);
         (_a = this.getListForOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount);
         if (onTrigger) {
@@ -211,7 +211,7 @@ class DLOB {
     }
     delete(order, userAccount, slot, onDelete) {
         var _a;
-        if (__1.isVariant(order.status, 'init')) {
+        if ((0, __1.isVariant)(order.status, 'init')) {
             return;
         }
         this.updateRestingLimitOrders(slot);
@@ -221,29 +221,29 @@ class DLOB {
         }
     }
     getListForOrder(order, slot) {
-        const isInactiveTriggerOrder = __1.mustBeTriggered(order) && !__1.isTriggered(order);
+        const isInactiveTriggerOrder = (0, __1.mustBeTriggered)(order) && !(0, __1.isTriggered)(order);
         let type;
         if (isInactiveTriggerOrder) {
             type = 'trigger';
         }
-        else if (__1.isOneOfVariant(order.orderType, ['market', 'triggerMarket', 'oracle'])) {
+        else if ((0, __1.isOneOfVariant)(order.orderType, ['market', 'triggerMarket', 'oracle'])) {
             type = 'market';
         }
         else if (order.oraclePriceOffset !== 0) {
             type = 'floatingLimit';
         }
         else {
-            const isResting = __1.isRestingLimitOrder(order, slot);
+            const isResting = (0, __1.isRestingLimitOrder)(order, slot);
             type = isResting ? 'restingLimit' : 'takingLimit';
         }
         let subType;
         if (isInactiveTriggerOrder) {
-            subType = __1.isVariant(order.triggerCondition, 'above') ? 'above' : 'below';
+            subType = (0, __1.isVariant)(order.triggerCondition, 'above') ? 'above' : 'below';
         }
         else {
-            subType = __1.isVariant(order.direction, 'long') ? 'bid' : 'ask';
+            subType = (0, __1.isVariant)(order.direction, 'long') ? 'bid' : 'ask';
         }
-        const marketType = __1.getVariant(order.marketType);
+        const marketType = (0, __1.getVariant)(order.marketType);
         if (!this.orderLists.has(marketType)) {
             return undefined;
         }
@@ -261,7 +261,7 @@ class DLOB {
         for (const [_, nodeLists] of this.orderLists.get(marketTypeStr)) {
             const nodesToUpdate = [];
             for (const node of nodeLists.takingLimit.ask.getGenerator()) {
-                if (!__1.isRestingLimitOrder(node.order, slot)) {
+                if (!(0, __1.isRestingLimitOrder)(node.order, slot)) {
                     continue;
                 }
                 nodesToUpdate.push({
@@ -270,7 +270,7 @@ class DLOB {
                 });
             }
             for (const node of nodeLists.takingLimit.bid.getGenerator()) {
-                if (!__1.isRestingLimitOrder(node.order, slot)) {
+                if (!(0, __1.isRestingLimitOrder)(node.order, slot)) {
                     continue;
                 }
                 nodesToUpdate.push({
@@ -286,7 +286,7 @@ class DLOB {
         }
     }
     getOrder(orderId, userAccount) {
-        const orderSignature = NodeList_1.getOrderSignature(orderId, userAccount);
+        const orderSignature = (0, NodeList_1.getOrderSignature)(orderId, userAccount);
         for (const nodeList of this.getNodeLists()) {
             const node = nodeList.get(orderSignature);
             if (node) {
@@ -296,18 +296,44 @@ class DLOB {
         return undefined;
     }
     findNodesToFill(marketIndex, fallbackBid, fallbackAsk, slot, ts, marketType, oraclePriceData, stateAccount, marketAccount) {
-        if (exchangeStatus_1.fillPaused(stateAccount, marketAccount)) {
+        if ((0, exchangeStatus_1.fillPaused)(stateAccount, marketAccount)) {
             return [];
         }
-        const isAmmPaused = exchangeStatus_1.ammPaused(stateAccount, marketAccount);
-        const minAuctionDuration = __1.isVariant(marketType, 'perp')
+        const isAmmPaused = (0, exchangeStatus_1.ammPaused)(stateAccount, marketAccount);
+        const minAuctionDuration = (0, __1.isVariant)(marketType, 'perp')
             ? stateAccount.minPerpAuctionDuration
             : 0;
         const restingLimitOrderNodesToFill = this.findRestingLimitOrderNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, fallbackAsk, fallbackBid);
         const takingOrderNodesToFill = this.findTakingNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, fallbackAsk, fallbackBid);
         // get expired market nodes
         const expiredNodesToFill = this.findExpiredNodesToFill(marketIndex, ts, marketType);
-        return restingLimitOrderNodesToFill.concat(takingOrderNodesToFill, expiredNodesToFill);
+        // for spot, multiple makers isn't supported, so don't merge
+        if ((0, __1.isVariant)(marketType, 'spot')) {
+            return restingLimitOrderNodesToFill.concat(takingOrderNodesToFill, expiredNodesToFill);
+        }
+        return this.mergeNodesToFill(restingLimitOrderNodesToFill, takingOrderNodesToFill).concat(expiredNodesToFill);
+    }
+    mergeNodesToFill(restingLimitOrderNodesToFill, takingOrderNodesToFill) {
+        const mergedNodesToFill = new Map();
+        const mergeNodesToFillHelper = (nodesToFillArray) => {
+            nodesToFillArray.forEach((nodeToFill) => {
+                const nodeSignature = (0, NodeList_1.getOrderSignature)(nodeToFill.node.order.orderId, nodeToFill.node.userAccount);
+                if (!mergedNodesToFill.has(nodeSignature)) {
+                    mergedNodesToFill.set(nodeSignature, {
+                        node: nodeToFill.node,
+                        makerNodes: [],
+                    });
+                }
+                if (nodeToFill.makerNodes) {
+                    mergedNodesToFill
+                        .get(nodeSignature)
+                        .makerNodes.push(...nodeToFill.makerNodes);
+                }
+            });
+        };
+        mergeNodesToFillHelper(restingLimitOrderNodesToFill);
+        mergeNodesToFillHelper(takingOrderNodesToFill);
+        return Array.from(mergedNodesToFill.values());
     }
     findRestingLimitOrderNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, fallbackAsk, fallbackBid) {
         const nodesToFill = new Array();
@@ -339,7 +365,7 @@ class DLOB {
         const nodesToFill = new Array();
         let takingOrderGenerator = this.getTakingAsks(marketIndex, marketType, slot, oraclePriceData);
         const takingAsksCrossingBids = this.findTakingNodesCrossingMakerNodes(marketIndex, slot, marketType, oraclePriceData, takingOrderGenerator, this.getMakerLimitBids.bind(this), (takerPrice, makerPrice) => {
-            if (__1.isVariant(marketType, 'spot')) {
+            if ((0, __1.isVariant)(marketType, 'spot')) {
                 if (takerPrice === undefined) {
                     return false;
                 }
@@ -363,7 +389,7 @@ class DLOB {
         }
         takingOrderGenerator = this.getTakingBids(marketIndex, marketType, slot, oraclePriceData);
         const takingBidsToFill = this.findTakingNodesCrossingMakerNodes(marketIndex, slot, marketType, oraclePriceData, takingOrderGenerator, this.getMakerLimitAsks.bind(this), (takerPrice, makerPrice) => {
-            if (__1.isVariant(marketType, 'spot')) {
+            if ((0, __1.isVariant)(marketType, 'spot')) {
                 if (takerPrice === undefined) {
                     return false;
                 }
@@ -407,7 +433,7 @@ class DLOB {
                 }
                 nodesToFill.push({
                     node: takerNode,
-                    makerNode: makerNode,
+                    makerNodes: [makerNode],
                 });
                 const makerOrder = makerNode.order;
                 const takerOrder = takerNode.order;
@@ -435,20 +461,20 @@ class DLOB {
         let nextNode = nodeGenerator.next();
         while (!nextNode.done) {
             const node = nextNode.value;
-            if (__1.isVariant(marketType, 'spot') && ((_a = node.order) === null || _a === void 0 ? void 0 : _a.postOnly)) {
+            if ((0, __1.isVariant)(marketType, 'spot') && ((_a = node.order) === null || _a === void 0 ? void 0 : _a.postOnly)) {
                 nextNode = nodeGenerator.next();
                 continue;
             }
-            const nodePrice = __1.getLimitPrice(node.order, oraclePriceData, slot);
+            const nodePrice = (0, __1.getLimitPrice)(node.order, oraclePriceData, slot);
             // order crosses if there is no limit price or it crosses fallback price
             const crosses = doesCross(nodePrice, fallbackPrice);
             // fallback is available if auction is complete or it's a spot order
-            const fallbackAvailable = __1.isVariant(marketType, 'spot') ||
-                __1.isFallbackAvailableLiquiditySource(node.order, minAuctionDuration, slot);
+            const fallbackAvailable = (0, __1.isVariant)(marketType, 'spot') ||
+                (0, __1.isFallbackAvailableLiquiditySource)(node.order, minAuctionDuration, slot);
             if (crosses && fallbackAvailable) {
                 nodesToFill.push({
                     node: node,
-                    makerNode: undefined, // filled by fallback
+                    makerNodes: [], // filled by fallback
                 });
             }
             nextNode = nodeGenerator.next();
@@ -457,7 +483,7 @@ class DLOB {
     }
     findExpiredNodesToFill(marketIndex, ts, marketType) {
         const nodesToFill = new Array();
-        const marketTypeStr = __1.getVariant(marketType);
+        const marketTypeStr = (0, __1.getVariant)(marketType);
         const nodeLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!nodeLists) {
             return nodesToFill;
@@ -477,18 +503,20 @@ class DLOB {
         ];
         for (const bidGenerator of bidGenerators) {
             for (const bid of bidGenerator) {
-                if (__1.isOrderExpired(bid.order, ts)) {
+                if ((0, __1.isOrderExpired)(bid.order, ts)) {
                     nodesToFill.push({
                         node: bid,
+                        makerNodes: [],
                     });
                 }
             }
         }
         for (const askGenerator of askGenerators) {
             for (const ask of askGenerator) {
-                if (__1.isOrderExpired(ask.order, ts)) {
+                if ((0, __1.isOrderExpired)(ask.order, ts)) {
                     nodesToFill.push({
                         node: ask,
+                        makerNodes: [],
                     });
                 }
             }
@@ -501,17 +529,19 @@ class DLOB {
         for (const marketBid of this.getTakingBids(marketIndex, marketType, slot, oraclePriceData)) {
             nodesToFill.push({
                 node: marketBid,
+                makerNodes: [],
             });
         }
         for (const marketAsk of this.getTakingAsks(marketIndex, marketType, slot, oraclePriceData)) {
             nodesToFill.push({
                 node: marketAsk,
+                makerNodes: [],
             });
         }
         return nodesToFill;
     }
     *getTakingBids(marketIndex, marketType, slot, oraclePriceData) {
-        const marketTypeStr = __1.getVariant(marketType);
+        const marketTypeStr = (0, __1.getVariant)(marketType);
         const orderLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!orderLists) {
             return;
@@ -526,7 +556,7 @@ class DLOB {
         });
     }
     *getTakingAsks(marketIndex, marketType, slot, oraclePriceData) {
-        const marketTypeStr = __1.getVariant(marketType);
+        const marketTypeStr = (0, __1.getVariant)(marketType);
         const orderLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!orderLists) {
             return;
@@ -577,11 +607,11 @@ class DLOB {
         }
     }
     *getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData) {
-        if (__1.isVariant(marketType, 'spot') && !oraclePriceData) {
+        if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot asks');
         }
         this.updateRestingLimitOrders(slot);
-        const marketTypeStr = __1.getVariant(marketType);
+        const marketTypeStr = (0, __1.getVariant)(marketType);
         const nodeLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!nodeLists) {
             return;
@@ -612,11 +642,11 @@ class DLOB {
         }
     }
     *getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData) {
-        if (__1.isVariant(marketType, 'spot') && !oraclePriceData) {
+        if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot bids');
         }
         this.updateRestingLimitOrders(slot);
-        const marketTypeStr = __1.getVariant(marketType);
+        const marketTypeStr = (0, __1.getVariant)(marketType);
         const nodeLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!nodeLists) {
             return;
@@ -647,23 +677,23 @@ class DLOB {
         }
     }
     *getAsks(marketIndex, fallbackAsk, slot, marketType, oraclePriceData) {
-        if (__1.isVariant(marketType, 'spot') && !oraclePriceData) {
+        if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot asks');
         }
         const generatorList = [
             this.getTakingAsks(marketIndex, marketType, slot, oraclePriceData),
             this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData),
         ];
-        const marketTypeStr = __1.getVariant(marketType);
+        const marketTypeStr = (0, __1.getVariant)(marketType);
         if (marketTypeStr === 'perp' && fallbackAsk) {
-            generatorList.push(NodeList_1.getVammNodeGenerator(fallbackAsk));
+            generatorList.push((0, NodeList_1.getVammNodeGenerator)(fallbackAsk));
         }
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
             const bestNodeTaking = bestNode.order
-                ? __1.isTakingOrder(bestNode.order, slot)
+                ? (0, __1.isTakingOrder)(bestNode.order, slot)
                 : false;
             const currentNodeTaking = currentNode.order
-                ? __1.isTakingOrder(currentNode.order, slot)
+                ? (0, __1.isTakingOrder)(currentNode.order, slot)
                 : false;
             if (bestNodeTaking && currentNodeTaking) {
                 return bestNode.order.slot.lt(currentNode.order.slot);
@@ -680,23 +710,23 @@ class DLOB {
         });
     }
     *getBids(marketIndex, fallbackBid, slot, marketType, oraclePriceData) {
-        if (__1.isVariant(marketType, 'spot') && !oraclePriceData) {
+        if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot bids');
         }
         const generatorList = [
             this.getTakingBids(marketIndex, marketType, slot, oraclePriceData),
             this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData),
         ];
-        const marketTypeStr = __1.getVariant(marketType);
+        const marketTypeStr = (0, __1.getVariant)(marketType);
         if (marketTypeStr === 'perp' && fallbackBid) {
-            generatorList.push(NodeList_1.getVammNodeGenerator(fallbackBid));
+            generatorList.push((0, NodeList_1.getVammNodeGenerator)(fallbackBid));
         }
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
             const bestNodeTaking = bestNode.order
-                ? __1.isTakingOrder(bestNode.order, slot)
+                ? (0, __1.isTakingOrder)(bestNode.order, slot)
                 : false;
             const currentNodeTaking = currentNode.order
-                ? __1.isTakingOrder(currentNode.order, slot)
+                ? (0, __1.isTakingOrder)(currentNode.order, slot)
                 : false;
             if (bestNodeTaking && currentNodeTaking) {
                 return bestNode.order.slot.lt(currentNode.order.slot);
@@ -750,7 +780,7 @@ class DLOB {
                 this.getListForOrder(newAskOrder, slot).update(newAskOrder, askNode.userAccount);
                 nodesToFill.push({
                     node: takerNode,
-                    makerNode: makerNode,
+                    makerNodes: [makerNode],
                 });
                 if (newAskOrder.baseAssetAmount.eq(newAskOrder.baseAssetAmountFilled)) {
                     break;
@@ -801,11 +831,11 @@ class DLOB {
             .value.getPrice(oraclePriceData, slot);
     }
     findNodesToTrigger(marketIndex, slot, oraclePrice, marketType, stateAccount) {
-        if (exchangeStatus_1.exchangePaused(stateAccount)) {
+        if ((0, exchangeStatus_1.exchangePaused)(stateAccount)) {
             return [];
         }
         const nodesToTrigger = [];
-        const marketTypeStr = __1.getVariant(marketType);
+        const marketTypeStr = (0, __1.getVariant)(marketType);
         const marketNodeLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         const triggerAboveList = marketNodeLists
             ? marketNodeLists.trigger.above
@@ -840,46 +870,46 @@ class DLOB {
         return nodesToTrigger;
     }
     printTopOfOrderLists(sdkConfig, driftClient, slotSubscriber, marketIndex, marketType) {
-        if (__1.isVariant(marketType, 'perp')) {
+        if ((0, __1.isVariant)(marketType, 'perp')) {
             const market = driftClient.getPerpMarketAccount(marketIndex);
             const slot = slotSubscriber.getSlot();
             const oraclePriceData = driftClient.getOracleDataForPerpMarket(marketIndex);
-            const fallbackAsk = __1.calculateAskPrice(market, oraclePriceData);
-            const fallbackBid = __1.calculateBidPrice(market, oraclePriceData);
+            const fallbackAsk = (0, __1.calculateAskPrice)(market, oraclePriceData);
+            const fallbackBid = (0, __1.calculateBidPrice)(market, oraclePriceData);
             const bestAsk = this.getBestAsk(marketIndex, fallbackAsk, slot, marketType, oraclePriceData);
             const bestBid = this.getBestBid(marketIndex, fallbackBid, slot, marketType, oraclePriceData);
             const mid = bestAsk.add(bestBid).div(new __1.BN(2));
-            const bidSpread = (__1.convertToNumber(bestBid, __1.PRICE_PRECISION) /
-                __1.convertToNumber(oraclePriceData.price, __1.PRICE_PRECISION) -
+            const bidSpread = ((0, __1.convertToNumber)(bestBid, __1.PRICE_PRECISION) /
+                (0, __1.convertToNumber)(oraclePriceData.price, __1.PRICE_PRECISION) -
                 1) *
                 100.0;
-            const askSpread = (__1.convertToNumber(bestAsk, __1.PRICE_PRECISION) /
-                __1.convertToNumber(oraclePriceData.price, __1.PRICE_PRECISION) -
+            const askSpread = ((0, __1.convertToNumber)(bestAsk, __1.PRICE_PRECISION) /
+                (0, __1.convertToNumber)(oraclePriceData.price, __1.PRICE_PRECISION) -
                 1) *
                 100.0;
             console.log(`Market ${sdkConfig.MARKETS[marketIndex].symbol} Orders`);
-            console.log(`  Ask`, __1.convertToNumber(bestAsk, __1.PRICE_PRECISION).toFixed(3), `(${askSpread.toFixed(4)}%)`);
-            console.log(`  Mid`, __1.convertToNumber(mid, __1.PRICE_PRECISION).toFixed(3));
-            console.log(`  Bid`, __1.convertToNumber(bestBid, __1.PRICE_PRECISION).toFixed(3), `(${bidSpread.toFixed(4)}%)`);
+            console.log(`  Ask`, (0, __1.convertToNumber)(bestAsk, __1.PRICE_PRECISION).toFixed(3), `(${askSpread.toFixed(4)}%)`);
+            console.log(`  Mid`, (0, __1.convertToNumber)(mid, __1.PRICE_PRECISION).toFixed(3));
+            console.log(`  Bid`, (0, __1.convertToNumber)(bestBid, __1.PRICE_PRECISION).toFixed(3), `(${bidSpread.toFixed(4)}%)`);
         }
-        else if (__1.isVariant(marketType, 'spot')) {
+        else if ((0, __1.isVariant)(marketType, 'spot')) {
             const slot = slotSubscriber.getSlot();
             const oraclePriceData = driftClient.getOracleDataForPerpMarket(marketIndex);
             const bestAsk = this.getBestAsk(marketIndex, undefined, slot, marketType, oraclePriceData);
             const bestBid = this.getBestBid(marketIndex, undefined, slot, marketType, oraclePriceData);
             const mid = bestAsk.add(bestBid).div(new __1.BN(2));
-            const bidSpread = (__1.convertToNumber(bestBid, __1.PRICE_PRECISION) /
-                __1.convertToNumber(oraclePriceData.price, __1.PRICE_PRECISION) -
+            const bidSpread = ((0, __1.convertToNumber)(bestBid, __1.PRICE_PRECISION) /
+                (0, __1.convertToNumber)(oraclePriceData.price, __1.PRICE_PRECISION) -
                 1) *
                 100.0;
-            const askSpread = (__1.convertToNumber(bestAsk, __1.PRICE_PRECISION) /
-                __1.convertToNumber(oraclePriceData.price, __1.PRICE_PRECISION) -
+            const askSpread = ((0, __1.convertToNumber)(bestAsk, __1.PRICE_PRECISION) /
+                (0, __1.convertToNumber)(oraclePriceData.price, __1.PRICE_PRECISION) -
                 1) *
                 100.0;
             console.log(`Market ${sdkConfig.MARKETS[marketIndex].symbol} Orders`);
-            console.log(`  Ask`, __1.convertToNumber(bestAsk, __1.PRICE_PRECISION).toFixed(3), `(${askSpread.toFixed(4)}%)`);
-            console.log(`  Mid`, __1.convertToNumber(mid, __1.PRICE_PRECISION).toFixed(3));
-            console.log(`  Bid`, __1.convertToNumber(bestBid, __1.PRICE_PRECISION).toFixed(3), `(${bidSpread.toFixed(4)}%)`);
+            console.log(`  Ask`, (0, __1.convertToNumber)(bestAsk, __1.PRICE_PRECISION).toFixed(3), `(${askSpread.toFixed(4)}%)`);
+            console.log(`  Mid`, (0, __1.convertToNumber)(mid, __1.PRICE_PRECISION).toFixed(3));
+            console.log(`  Bid`, (0, __1.convertToNumber)(bestBid, __1.PRICE_PRECISION).toFixed(3), `(${bidSpread.toFixed(4)}%)`);
         }
     }
     getDLOBOrders() {

package/lib/dlob/DLOBNode.d.ts

@@ -47,12 +47,12 @@ export declare class TriggerOrderNode extends OrderNode {
     previous?: TriggerOrderNode;
     getSortValue(order: Order): BN;
 }
-export declare type DLOBNodeMap = {
+export type DLOBNodeMap = {
     restingLimit: RestingLimitOrderNode;
     takingLimit: TakingLimitOrderNode;
     floatingLimit: FloatingLimitOrderNode;
     market: MarketOrderNode;
     trigger: TriggerOrderNode;
 };
-export declare type DLOBNodeType = 'restingLimit' | 'takingLimit' | 'floatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
+export type DLOBNodeType = 'restingLimit' | 'takingLimit' | 'floatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
 export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: PublicKey): DLOBNodeMap[T];

package/lib/dlob/DLOBNode.js

@@ -13,20 +13,20 @@ class OrderNode {
         this.sortValue = this.getSortValue(order);
     }
     getLabel() {
-        let msg = `Order ${NodeList_1.getOrderSignature(this.order.orderId, this.userAccount)}`;
-        msg += ` ${__1.isVariant(this.order.direction, 'long') ? 'LONG' : 'SHORT'} `;
-        msg += `${__1.convertToNumber(this.order.baseAssetAmount, __1.AMM_RESERVE_PRECISION).toFixed(3)}`;
+        let msg = `Order ${(0, NodeList_1.getOrderSignature)(this.order.orderId, this.userAccount)}`;
+        msg += ` ${(0, __1.isVariant)(this.order.direction, 'long') ? 'LONG' : 'SHORT'} `;
+        msg += `${(0, __1.convertToNumber)(this.order.baseAssetAmount, __1.AMM_RESERVE_PRECISION).toFixed(3)}`;
         if (this.order.price.gt(__1.ZERO)) {
-            msg += ` @ ${__1.convertToNumber(this.order.price, __1.PRICE_PRECISION).toFixed(3)}`;
+            msg += ` @ ${(0, __1.convertToNumber)(this.order.price, __1.PRICE_PRECISION).toFixed(3)}`;
         }
         if (this.order.triggerPrice.gt(__1.ZERO)) {
-            msg += ` ${__1.isVariant(this.order.triggerCondition, 'below') ? 'BELOW' : 'ABOVE'}`;
-            msg += ` ${__1.convertToNumber(this.order.triggerPrice, __1.PRICE_PRECISION).toFixed(3)}`;
+            msg += ` ${(0, __1.isVariant)(this.order.triggerCondition, 'below') ? 'BELOW' : 'ABOVE'}`;
+            msg += ` ${(0, __1.convertToNumber)(this.order.triggerPrice, __1.PRICE_PRECISION).toFixed(3)}`;
         }
         return msg;
     }
     getPrice(oraclePriceData, slot) {
-        return __1.getLimitPrice(this.order, oraclePriceData, slot);
+        return (0, __1.getLimitPrice)(this.order, oraclePriceData, slot);
     }
     isBaseFilled() {
         return this.order.baseAssetAmountFilled.eq(this.order.baseAssetAmount);

package/lib/dlob/DLOBOrders.d.ts

@@ -2,11 +2,11 @@
 import { PublicKey } from '@solana/web3.js';
 import { Idl } from '@project-serum/anchor';
 import { Order } from '../types';
-export declare type DLOBOrder = {
+export type DLOBOrder = {
     user: PublicKey;
     order: Order;
 };
-export declare type DLOBOrders = DLOBOrder[];
+export type DLOBOrders = DLOBOrder[];
 export declare class DLOBOrdersCoder {
     private idl;
     constructor(idl: Idl);

package/lib/dlob/NodeList.d.ts

@@ -2,7 +2,7 @@
 import { BN, MarketTypeStr, Order } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { DLOBNode, DLOBNodeMap } from './DLOBNode';
-export declare type SortDirection = 'asc' | 'desc';
+export type SortDirection = 'asc' | 'desc';
 export declare function getOrderSignature(orderId: number, userAccount: PublicKey): string;
 export interface DLOBNodeGenerator {
     getGenerator(): Generator<DLOBNode>;

package/lib/dlob/NodeList.js

@@ -20,10 +20,10 @@ class NodeList {
         this.nodeMap.clear();
     }
     insert(order, marketType, userAccount) {
-        if (__1.isVariant(order.status, 'init')) {
+        if ((0, __1.isVariant)(order.status, 'init')) {
             return;
         }
-        const newNode = DLOBNode_1.createNode(this.nodeType, order, userAccount);
+        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount);
         const orderSignature = getOrderSignature(order.orderId, userAccount);
         if (this.nodeMap.has(orderSignature)) {
             return;

package/lib/driftClient.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
 import { AnchorProvider, BN, Program } from '@project-serum/anchor';
-import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, OrderType, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, OrderTriggerCondition } from './types';
+import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, OrderType, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, OrderTriggerCondition, PerpMarketExtendedInfo } from './types';
 import * as anchor from '@project-serum/anchor';
 import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Signer, AddressLookupTableAccount } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
@@ -14,7 +14,7 @@ import { DriftClientConfig } from './driftClientConfig';
 import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
 import { UserStats } from './userStats';
-declare type RemainingAccountParams = {
+type RemainingAccountParams = {
     userAccounts: UserAccount[];
     writablePerpMarketIndexes?: number[];
     writableSpotMarketIndexes?: number[];
@@ -320,6 +320,7 @@ export declare class DriftClient {
     settleRevenueToInsuranceFund(marketIndex: number): Promise<TransactionSignature>;
     resolvePerpPnlDeficit(spotMarketIndex: number, perpMarketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getResolvePerpPnlDeficitIx(spotMarketIndex: number, perpMarketIndex: number): Promise<TransactionInstruction>;
+    getPerpMarketExtendedInfo(marketIndex: number): PerpMarketExtendedInfo;
     sendTransaction(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
 }
 export {};