@drift-labs/sdk 2.12.0-beta.2 → 2.12.0

package/lib/dlob/DLOB.js

@@ -78,10 +78,10 @@ class DLOB {
         this.insertOrder(record.order, record.user);
     }
     handleOrderActionRecord(record) {
-        if ((0, __1.isOneOfVariant)(record.action, ['place', 'expire'])) {
+        if (__1.isOneOfVariant(record.action, ['place', 'expire'])) {
             return;
         }
-        if ((0, __1.isVariant)(record.action, 'trigger')) {
+        if (__1.isVariant(record.action, 'trigger')) {
             if (record.taker !== null) {
                 const takerOrder = this.getOrder(record.takerOrderId, record.taker);
                 if (takerOrder) {
@@ -95,7 +95,7 @@ class DLOB {
                 }
             }
         }
-        else if ((0, __1.isVariant)(record.action, 'fill')) {
+        else if (__1.isVariant(record.action, 'fill')) {
             if (record.taker !== null) {
                 const takerOrder = this.getOrder(record.takerOrderId, record.taker);
                 if (takerOrder) {
@@ -109,7 +109,7 @@ class DLOB {
                 }
             }
         }
-        else if ((0, __1.isVariant)(record.action, 'cancel')) {
+        else if (__1.isVariant(record.action, 'cancel')) {
             if (record.taker !== null) {
                 const takerOrder = this.getOrder(record.takerOrderId, record.taker);
                 if (takerOrder) {
@@ -126,20 +126,20 @@ class DLOB {
     }
     insertOrder(order, userAccount, onInsert) {
         var _a;
-        if ((0, __1.isVariant)(order.status, 'init')) {
+        if (__1.isVariant(order.status, 'init')) {
             return;
         }
-        if (!(0, __1.isOneOfVariant)(order.orderType, SUPPORTED_ORDER_TYPES)) {
+        if (!__1.isOneOfVariant(order.orderType, SUPPORTED_ORDER_TYPES)) {
             return;
         }
-        const marketType = (0, __1.getVariant)(order.marketType);
+        const marketType = __1.getVariant(order.marketType);
         if (!this.orderLists.get(marketType).has(order.marketIndex)) {
             this.addOrderList(marketType, order.marketIndex);
         }
-        if ((0, __1.isVariant)(order.status, 'open')) {
+        if (__1.isVariant(order.status, 'open')) {
             this.openOrders
                 .get(marketType)
-                .add((0, NodeList_1.getOrderSignature)(order.orderId, userAccount));
+                .add(NodeList_1.getOrderSignature(order.orderId, userAccount));
         }
         (_a = this.getListForOrder(order)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount);
         if (onInsert) {
@@ -186,15 +186,15 @@ class DLOB {
     }
     trigger(order, userAccount, onTrigger) {
         var _a;
-        if ((0, __1.isVariant)(order.status, 'init')) {
+        if (__1.isVariant(order.status, 'init')) {
             return;
         }
-        if ((0, __1.isTriggered)(order)) {
+        if (__1.isTriggered(order)) {
             return;
         }
-        const marketType = (0, __1.getVariant)(order.marketType);
+        const marketType = __1.getVariant(order.marketType);
         const triggerList = this.orderLists.get(marketType).get(order.marketIndex)
-            .trigger[(0, __1.isVariant)(order.triggerCondition, 'above') ? 'above' : 'below'];
+            .trigger[__1.isVariant(order.triggerCondition, 'above') ? 'above' : 'below'];
         triggerList.remove(order, userAccount);
         (_a = this.getListForOrder(order)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount);
         if (onTrigger) {
@@ -203,7 +203,7 @@ class DLOB {
     }
     delete(order, userAccount, onDelete) {
         var _a;
-        if ((0, __1.isVariant)(order.status, 'init')) {
+        if (__1.isVariant(order.status, 'init')) {
             return;
         }
         (_a = this.getListForOrder(order)) === null || _a === void 0 ? void 0 : _a.remove(order, userAccount);
@@ -212,12 +212,12 @@ class DLOB {
         }
     }
     getListForOrder(order) {
-        const isInactiveTriggerOrder = (0, __1.mustBeTriggered)(order) && !(0, __1.isTriggered)(order);
+        const isInactiveTriggerOrder = __1.mustBeTriggered(order) && !__1.isTriggered(order);
         let type;
         if (isInactiveTriggerOrder) {
             type = 'trigger';
         }
-        else if ((0, __1.isOneOfVariant)(order.orderType, ['market', 'triggerMarket', 'oracle'])) {
+        else if (__1.isOneOfVariant(order.orderType, ['market', 'triggerMarket', 'oracle'])) {
             type = 'market';
         }
         else if (order.oraclePriceOffset !== 0) {
@@ -228,12 +228,12 @@ class DLOB {
         }
         let subType;
         if (isInactiveTriggerOrder) {
-            subType = (0, __1.isVariant)(order.triggerCondition, 'above') ? 'above' : 'below';
+            subType = __1.isVariant(order.triggerCondition, 'above') ? 'above' : 'below';
         }
         else {
-            subType = (0, __1.isVariant)(order.direction, 'long') ? 'bid' : 'ask';
+            subType = __1.isVariant(order.direction, 'long') ? 'bid' : 'ask';
         }
-        const marketType = (0, __1.getVariant)(order.marketType);
+        const marketType = __1.getVariant(order.marketType);
         if (!this.orderLists.has(marketType)) {
             return undefined;
         }
@@ -249,10 +249,10 @@ class DLOB {
         return undefined;
     }
     findNodesToFill(marketIndex, fallbackBid, fallbackAsk, slot, ts, marketType, oraclePriceData, stateAccount, marketAccount) {
-        if ((0, exchangeStatus_1.fillPaused)(stateAccount, marketAccount)) {
+        if (exchangeStatus_1.fillPaused(stateAccount, marketAccount)) {
             return [];
         }
-        const isAmmPaused = (0, exchangeStatus_1.ammPaused)(stateAccount, marketAccount);
+        const isAmmPaused = exchangeStatus_1.ammPaused(stateAccount, marketAccount);
         const marketOrderNodesToFill = this.findMarketNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, fallbackAsk, fallbackBid);
         const limitOrderNodesToFill = this.findLimitOrderNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, fallbackAsk, fallbackBid);
         // get expired market nodes
@@ -288,9 +288,9 @@ class DLOB {
     findMarketNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, fallbackAsk, fallbackBid) {
         const nodesToFill = new Array();
         let marketOrderGenerator = this.getMarketAsks(marketIndex, marketType);
-        const marketAsksCrossingBids = this.findMarketNodesCrossingLimitNodes(marketIndex, slot, marketType, oraclePriceData, marketOrderGenerator, this.getLimitBids.bind(this), (takerPrice, makerPrice) => {
+        const marketAsksCrossingBids = this.findMarketNodesCrossingLimitNodes(marketIndex, slot, marketType, oraclePriceData, marketOrderGenerator, this.getMakerLimitBids.bind(this), (takerPrice, makerPrice) => {
             return takerPrice === undefined || takerPrice.lte(makerPrice);
-        });
+        }, fallbackAsk);
         for (const marketAskCrossingBid of marketAsksCrossingBids) {
             nodesToFill.push(marketAskCrossingBid);
         }
@@ -304,9 +304,9 @@ class DLOB {
             }
         }
         marketOrderGenerator = this.getMarketBids(marketIndex, marketType);
-        const marketBidsToFill = this.findMarketNodesCrossingLimitNodes(marketIndex, slot, marketType, oraclePriceData, marketOrderGenerator, this.getLimitAsks.bind(this), (takerPrice, fallbackPrice) => {
+        const marketBidsToFill = this.findMarketNodesCrossingLimitNodes(marketIndex, slot, marketType, oraclePriceData, marketOrderGenerator, this.getMakerLimitAsks.bind(this), (takerPrice, fallbackPrice) => {
             return takerPrice === undefined || takerPrice.gte(fallbackPrice);
-        });
+        }, fallbackBid);
         for (const marketBidToFill of marketBidsToFill) {
             nodesToFill.push(marketBidToFill);
         }
@@ -321,10 +321,10 @@ class DLOB {
         }
         return nodesToFill;
     }
-    findMarketNodesCrossingLimitNodes(marketIndex, slot, marketType, oraclePriceData, takerNodeGenerator, makerNodeGeneratorFn, doesCross) {
+    findMarketNodesCrossingLimitNodes(marketIndex, slot, marketType, oraclePriceData, takerNodeGenerator, makerNodeGeneratorFn, doesCross, fallbackPrice) {
         const nodesToFill = new Array();
         for (const takerNode of takerNodeGenerator) {
-            const makerNodeGenerator = makerNodeGeneratorFn(marketIndex, slot, marketType, oraclePriceData);
+            const makerNodeGenerator = makerNodeGeneratorFn(marketIndex, slot, marketType, oraclePriceData, fallbackPrice);
             for (const makerNode of makerNodeGenerator) {
                 // Can't match orders from the same user
                 const sameUser = takerNode.userAccount.equals(makerNode.userAccount);
@@ -369,15 +369,15 @@ class DLOB {
         let nextNode = nodeGenerator.next();
         while (!nextNode.done) {
             const node = nextNode.value;
-            if ((0, __1.isVariant)(marketType, 'spot') && ((_a = node.order) === null || _a === void 0 ? void 0 : _a.postOnly)) {
+            if (__1.isVariant(marketType, 'spot') && ((_a = node.order) === null || _a === void 0 ? void 0 : _a.postOnly)) {
                 nextNode = nodeGenerator.next();
                 continue;
             }
-            const nodePrice = (0, __1.getLimitPrice)(node.order, oraclePriceData, slot);
+            const nodePrice = __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 = (0, __1.isVariant)(marketType, 'spot') || (0, __1.isAuctionComplete)(node.order, slot);
+            const fallbackAvailable = __1.isVariant(marketType, 'spot') || __1.isAuctionComplete(node.order, slot);
             if (crosses && fallbackAvailable) {
                 nodesToFill.push({
                     node: node,
@@ -390,7 +390,7 @@ class DLOB {
     }
     findExpiredNodesToFill(marketIndex, ts, marketType) {
         const nodesToFill = new Array();
-        const marketTypeStr = (0, __1.getVariant)(marketType);
+        const marketTypeStr = __1.getVariant(marketType);
         const nodeLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!nodeLists) {
             return nodesToFill;
@@ -408,7 +408,7 @@ class DLOB {
         ];
         for (const bidGenerator of bidGenerators) {
             for (const bid of bidGenerator) {
-                if ((0, __1.isOrderExpired)(bid.order, ts)) {
+                if (__1.isOrderExpired(bid.order, ts)) {
                     nodesToFill.push({
                         node: bid,
                     });
@@ -417,7 +417,7 @@ class DLOB {
         }
         for (const askGenerator of askGenerators) {
             for (const ask of askGenerator) {
-                if ((0, __1.isOrderExpired)(ask.order, ts)) {
+                if (__1.isOrderExpired(ask.order, ts)) {
                     nodesToFill.push({
                         node: ask,
                     });
@@ -430,14 +430,14 @@ class DLOB {
         const nodesToFill = new Array();
         // Then see if there are orders still in JIT auction
         for (const marketBid of this.getMarketBids(marketIndex, marketType)) {
-            if (!(0, __1.isAuctionComplete)(marketBid.order, slot)) {
+            if (!__1.isAuctionComplete(marketBid.order, slot)) {
                 nodesToFill.push({
                     node: marketBid,
                 });
             }
         }
         for (const marketAsk of this.getMarketAsks(marketIndex, marketType)) {
-            if (!(0, __1.isAuctionComplete)(marketAsk.order, slot)) {
+            if (!__1.isAuctionComplete(marketAsk.order, slot)) {
                 nodesToFill.push({
                     node: marketAsk,
                 });
@@ -446,7 +446,7 @@ class DLOB {
         return nodesToFill;
     }
     *getMarketBids(marketIndex, marketType) {
-        const marketTypeStr = (0, __1.getVariant)(marketType);
+        const marketTypeStr = __1.getVariant(marketType);
         const orderLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!orderLists) {
             return;
@@ -460,7 +460,7 @@ class DLOB {
         }
     }
     *getMarketAsks(marketIndex, marketType) {
-        const marketTypeStr = (0, __1.getVariant)(marketType);
+        const marketTypeStr = __1.getVariant(marketType);
         const orderLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!orderLists) {
             return;
@@ -492,10 +492,10 @@ class DLOB {
                 const bestValue = bestGenerator.next.value;
                 const currentValue = currentGenerator.next.value;
                 // always return the market orders first
-                if (bestValue.order && (0, __1.isMarketOrder)(bestValue.order)) {
+                if (bestValue.order && __1.isMarketOrder(bestValue.order)) {
                     return bestGenerator;
                 }
-                if (currentValue.order && (0, __1.isMarketOrder)(currentValue.order)) {
+                if (currentValue.order && __1.isMarketOrder(currentValue.order)) {
                     return currentGenerator;
                 }
                 const bestPrice = bestValue.getPrice(oraclePriceData, slot);
@@ -519,10 +519,10 @@ class DLOB {
         }
     }
     *getLimitAsks(marketIndex, slot, marketType, oraclePriceData) {
-        if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
+        if (__1.isVariant(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot asks');
         }
-        const marketTypeStr = (0, __1.getVariant)(marketType);
+        const marketTypeStr = __1.getVariant(marketType);
         const nodeLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!nodeLists) {
             return;
@@ -536,27 +536,30 @@ class DLOB {
         });
     }
     /**
-     * Filters the limit asks that are post only or have been place for sufficiently long
-     * Useful for displaying order book that doesn't have taker limit orders crossing spread
+     * Filters the limit asks that are post only, have been place for sufficiently long or are above the fallback bid
+     * Market orders can only fill against orders that meet this criteria
      *
      * @returns
      */
-    *getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData, minPerpAuctionDuration) {
+    *getMakerLimitAsks(marketIndex, slot, marketType, oraclePriceData, fallbackBid) {
         for (const node of this.getLimitAsks(marketIndex, slot, marketType, oraclePriceData)) {
-            if (this.isRestingLimitOrder(node.order, slot, minPerpAuctionDuration)) {
+            if (this.isRestingLimitOrder(node.order, slot)) {
+                yield node;
+            }
+            else if (fallbackBid &&
+                node.getPrice(oraclePriceData, slot).gt(fallbackBid)) {
                 yield node;
             }
         }
     }
-    isRestingLimitOrder(order, slot, minPerpAuctionDuration) {
-        return (order.postOnly ||
-            new __1.BN(slot).sub(order.slot).gte(new __1.BN(minPerpAuctionDuration * 1.5)));
+    isRestingLimitOrder(order, slot) {
+        return order.postOnly || new __1.BN(slot).sub(order.slot).gte(new __1.BN(15));
     }
     *getLimitBids(marketIndex, slot, marketType, oraclePriceData) {
-        if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
+        if (__1.isVariant(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot bids');
         }
-        const marketTypeStr = (0, __1.getVariant)(marketType);
+        const marketTypeStr = __1.getVariant(marketType);
         const nodeLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!nodeLists) {
             return;
@@ -570,45 +573,49 @@ class DLOB {
         });
     }
     /**
-     * Filters the limit bids that are post only or have been place for sufficiently long
-     * Useful for displaying order book that doesn't have taker limit orders crossing spread
+     * Filters the limit bids that are post only, have been place for sufficiently long or are below the fallback ask
+     * Market orders can only fill against orders that meet this criteria
      *
      * @returns
      */
-    *getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData, minPerpAuctionDuration) {
+    *getMakerLimitBids(marketIndex, slot, marketType, oraclePriceData, fallbackAsk) {
         for (const node of this.getLimitBids(marketIndex, slot, marketType, oraclePriceData)) {
-            if (this.isRestingLimitOrder(node.order, slot, minPerpAuctionDuration)) {
+            if (this.isRestingLimitOrder(node.order, slot)) {
+                yield node;
+            }
+            else if (fallbackAsk &&
+                node.getPrice(oraclePriceData, slot).lt(fallbackAsk)) {
                 yield node;
             }
         }
     }
     *getAsks(marketIndex, fallbackAsk, slot, marketType, oraclePriceData) {
-        if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
+        if (__1.isVariant(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot asks');
         }
         const generatorList = [
             this.getMarketAsks(marketIndex, marketType),
             this.getLimitAsks(marketIndex, slot, marketType, oraclePriceData),
         ];
-        const marketTypeStr = (0, __1.getVariant)(marketType);
+        const marketTypeStr = __1.getVariant(marketType);
         if (marketTypeStr === 'perp' && fallbackAsk) {
-            generatorList.push((0, NodeList_1.getVammNodeGenerator)(fallbackAsk));
+            generatorList.push(NodeList_1.getVammNodeGenerator(fallbackAsk));
         }
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestPrice, currentPrice) => {
             return bestPrice.lt(currentPrice);
         });
     }
     *getBids(marketIndex, fallbackBid, slot, marketType, oraclePriceData) {
-        if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
+        if (__1.isVariant(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot bids');
         }
         const generatorList = [
             this.getMarketBids(marketIndex, marketType),
             this.getLimitBids(marketIndex, slot, marketType, oraclePriceData),
         ];
-        const marketTypeStr = (0, __1.getVariant)(marketType);
+        const marketTypeStr = __1.getVariant(marketType);
         if (marketTypeStr === 'perp' && fallbackBid) {
-            generatorList.push((0, NodeList_1.getVammNodeGenerator)(fallbackBid));
+            generatorList.push(NodeList_1.getVammNodeGenerator(fallbackBid));
         }
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestPrice, currentPrice) => {
             return bestPrice.gt(currentPrice);
@@ -633,10 +640,10 @@ class DLOB {
                 }
                 const { takerNode, makerNode } = this.determineMakerAndTaker(askNode, bidNode);
                 // extra guard against bad fills for limit orders where auction is incomplete
-                if (!(0, __1.isAuctionComplete)(takerNode.order, slot)) {
+                if (!__1.isAuctionComplete(takerNode.order, slot)) {
                     let bidPrice;
                     let askPrice;
-                    if ((0, __1.isVariant)(takerNode.order.direction, 'long')) {
+                    if (__1.isVariant(takerNode.order.direction, 'long')) {
                         bidPrice = __1.BN.min(takerNode.getPrice(oraclePriceData, slot), fallbackAsk || __1.BN_MAX);
                         askPrice = makerNode.getPrice(oraclePriceData, slot);
                     }
@@ -708,11 +715,11 @@ class DLOB {
             .value.getPrice(oraclePriceData, slot);
     }
     findNodesToTrigger(marketIndex, slot, oraclePrice, marketType, stateAccount) {
-        if ((0, exchangeStatus_1.exchangePaused)(stateAccount)) {
+        if (exchangeStatus_1.exchangePaused(stateAccount)) {
             return [];
         }
         const nodesToTrigger = [];
-        const marketTypeStr = (0, __1.getVariant)(marketType);
+        const marketTypeStr = __1.getVariant(marketType);
         const marketNodeLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         const triggerAboveList = marketNodeLists
             ? marketNodeLists.trigger.above
@@ -720,7 +727,7 @@ class DLOB {
         if (triggerAboveList) {
             for (const node of triggerAboveList.getGenerator()) {
                 if (oraclePrice.gt(node.order.triggerPrice)) {
-                    if ((0, __1.isAuctionComplete)(node.order, slot)) {
+                    if (__1.isAuctionComplete(node.order, slot)) {
                         nodesToTrigger.push({
                             node: node,
                         });
@@ -737,7 +744,7 @@ class DLOB {
         if (triggerBelowList) {
             for (const node of triggerBelowList.getGenerator()) {
                 if (oraclePrice.lt(node.order.triggerPrice)) {
-                    if ((0, __1.isAuctionComplete)(node.order, slot)) {
+                    if (__1.isAuctionComplete(node.order, slot)) {
                         nodesToTrigger.push({
                             node: node,
                         });
@@ -751,46 +758,46 @@ class DLOB {
         return nodesToTrigger;
     }
     printTopOfOrderLists(sdkConfig, driftClient, slotSubscriber, marketIndex, marketType) {
-        if ((0, __1.isVariant)(marketType, 'perp')) {
+        if (__1.isVariant(marketType, 'perp')) {
             const market = driftClient.getPerpMarketAccount(marketIndex);
             const slot = slotSubscriber.getSlot();
             const oraclePriceData = driftClient.getOracleDataForPerpMarket(marketIndex);
-            const fallbackAsk = (0, __1.calculateAskPrice)(market, oraclePriceData);
-            const fallbackBid = (0, __1.calculateBidPrice)(market, oraclePriceData);
+            const fallbackAsk = __1.calculateAskPrice(market, oraclePriceData);
+            const fallbackBid = __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 = ((0, __1.convertToNumber)(bestBid, __1.PRICE_PRECISION) /
-                (0, __1.convertToNumber)(oraclePriceData.price, __1.PRICE_PRECISION) -
+            const bidSpread = (__1.convertToNumber(bestBid, __1.PRICE_PRECISION) /
+                __1.convertToNumber(oraclePriceData.price, __1.PRICE_PRECISION) -
                 1) *
                 100.0;
-            const askSpread = ((0, __1.convertToNumber)(bestAsk, __1.PRICE_PRECISION) /
-                (0, __1.convertToNumber)(oraclePriceData.price, __1.PRICE_PRECISION) -
+            const askSpread = (__1.convertToNumber(bestAsk, __1.PRICE_PRECISION) /
+                __1.convertToNumber(oraclePriceData.price, __1.PRICE_PRECISION) -
                 1) *
                 100.0;
             console.log(`Market ${sdkConfig.MARKETS[marketIndex].symbol} Orders`);
-            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)}%)`);
+            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)}%)`);
         }
-        else if ((0, __1.isVariant)(marketType, 'spot')) {
+        else if (__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 = ((0, __1.convertToNumber)(bestBid, __1.PRICE_PRECISION) /
-                (0, __1.convertToNumber)(oraclePriceData.price, __1.PRICE_PRECISION) -
+            const bidSpread = (__1.convertToNumber(bestBid, __1.PRICE_PRECISION) /
+                __1.convertToNumber(oraclePriceData.price, __1.PRICE_PRECISION) -
                 1) *
                 100.0;
-            const askSpread = ((0, __1.convertToNumber)(bestAsk, __1.PRICE_PRECISION) /
-                (0, __1.convertToNumber)(oraclePriceData.price, __1.PRICE_PRECISION) -
+            const askSpread = (__1.convertToNumber(bestAsk, __1.PRICE_PRECISION) /
+                __1.convertToNumber(oraclePriceData.price, __1.PRICE_PRECISION) -
                 1) *
                 100.0;
             console.log(`Market ${sdkConfig.MARKETS[marketIndex].symbol} Orders`);
-            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)}%)`);
+            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)}%)`);
         }
     }
     getDLOBOrders() {

package/lib/dlob/DLOBNode.js

@@ -13,20 +13,20 @@ class OrderNode {
         this.sortValue = this.getSortValue(order);
     }
     getLabel() {
-        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)}`;
+        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)}`;
         if (this.order.price.gt(__1.ZERO)) {
-            msg += ` @ ${(0, __1.convertToNumber)(this.order.price, __1.PRICE_PRECISION).toFixed(3)}`;
+            msg += ` @ ${__1.convertToNumber(this.order.price, __1.PRICE_PRECISION).toFixed(3)}`;
         }
         if (this.order.triggerPrice.gt(__1.ZERO)) {
-            msg += ` ${(0, __1.isVariant)(this.order.triggerCondition, 'below') ? 'BELOW' : 'ABOVE'}`;
-            msg += ` ${(0, __1.convertToNumber)(this.order.triggerPrice, __1.PRICE_PRECISION).toFixed(3)}`;
+            msg += ` ${__1.isVariant(this.order.triggerCondition, 'below') ? 'BELOW' : 'ABOVE'}`;
+            msg += ` ${__1.convertToNumber(this.order.triggerPrice, __1.PRICE_PRECISION).toFixed(3)}`;
         }
         return msg;
     }
     getPrice(oraclePriceData, slot) {
-        return (0, __1.getLimitPrice)(this.order, oraclePriceData, slot);
+        return __1.getLimitPrice(this.order, oraclePriceData, slot);
     }
     isBaseFilled() {
         return this.order.baseAssetAmountFilled.eq(this.order.baseAssetAmount);

package/lib/dlob/NodeList.js

@@ -20,10 +20,10 @@ class NodeList {
         this.nodeMap.clear();
     }
     insert(order, marketType, userAccount) {
-        if ((0, __1.isVariant)(order.status, 'init')) {
+        if (__1.isVariant(order.status, 'init')) {
             return;
         }
-        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount);
+        const newNode = 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, ReferrerInfo, MarketType, SerumV3FulfillmentConfigAccount } from './types';
+import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount } from './types';
 import * as anchor from '@project-serum/anchor';
 import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Signer } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
@@ -188,7 +188,7 @@ export declare class DriftClient {
     getFillPerpOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
     placeSpotOrder(orderParams: OptionalOrderParams): Promise<TransactionSignature>;
     getPlaceSpotOrderIx(orderParams: OptionalOrderParams): Promise<TransactionInstruction>;
-    fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
+    fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
     getFillSpotOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
     addSpotFulfillmentAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig?: SerumV3FulfillmentConfigAccount): void;
     addSerumRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: SerumV3FulfillmentConfigAccount): void;
@@ -200,7 +200,7 @@ export declare class DriftClient {
     getPlaceAndTakePerpOrderIx(orderParams: OptionalOrderParams, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
     placeAndMakePerpOrder(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
     getPlaceAndMakePerpOrderIx(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
-    placeAndTakeSpotOrder(orderParams: OptionalOrderParams, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
+    placeAndTakeSpotOrder(orderParams: OptionalOrderParams, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
     getPlaceAndTakeSpotOrderIx(orderParams: OptionalOrderParams, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
     placeAndMakeSpotOrder(orderParams: OptionalOrderParams, takerInfo: TakerInfo, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
     getPlaceAndMakeSpotOrderIx(orderParams: OptionalOrderParams, takerInfo: TakerInfo, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;