@drift-labs/sdk 2.34.1-beta.2 → 2.34.1-beta.4

package/VERSION

@@ -1 +1 @@
-2.34.1-beta.2
+2.34.1-beta.4

package/lib/dlob/DLOB.js

@@ -490,18 +490,9 @@ class DLOB {
             return nodesToFill;
         }
         // All bids/asks that can expire
-        const bidGenerators = [
-            nodeLists.takingLimit.bid.getGenerator(),
-            nodeLists.restingLimit.bid.getGenerator(),
-            nodeLists.floatingLimit.bid.getGenerator(),
-            nodeLists.market.bid.getGenerator(),
-        ];
-        const askGenerators = [
-            nodeLists.takingLimit.ask.getGenerator(),
-            nodeLists.restingLimit.ask.getGenerator(),
-            nodeLists.floatingLimit.ask.getGenerator(),
-            nodeLists.market.ask.getGenerator(),
-        ];
+        // dont try to expire limit orders with tif as its inefficient use of blockspace
+        const bidGenerators = [nodeLists.market.bid.getGenerator()];
+        const askGenerators = [nodeLists.market.ask.getGenerator()];
         for (const bidGenerator of bidGenerators) {
             for (const bid of bidGenerator) {
                 if ((0, __1.isOrderExpired)(bid.order, ts)) {

package/lib/math/funding.d.ts

@@ -8,16 +8,15 @@ import { OraclePriceData } from '../oracles/types';
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateAllEstimatedFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN, now?: BN): Promise<[BN, BN, BN, BN, BN]>;
+export declare function calculateAllEstimatedFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): Promise<[BN, BN, BN, BN, BN]>;
 /**
  *
  * @param market
  * @param oraclePriceData
  * @param periodAdjustment
- * @param estimationMethod
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateEstimatedFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN, estimationMethod?: 'interpolated' | 'lowerbound' | 'capped'): Promise<BN>;
+export declare function calculateLongShortFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): Promise<[BN, BN]>;
 /**
  *
  * @param market
@@ -25,15 +24,7 @@ export declare function calculateEstimatedFundingRate(market: PerpMarketAccount,
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateLongShortFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN]>;
-/**
- *
- * @param market
- * @param oraclePriceData
- * @param periodAdjustment
- * @returns Estimated funding rate. : Precision //TODO-PRECISION
- */
-export declare function calculateLongShortFundingRateAndLiveTwaps(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN, BN, BN]>;
+export declare function calculateLongShortFundingRateAndLiveTwaps(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, markPrice?: BN, now?: BN): Promise<[BN, BN, BN, BN]>;
 /**
  *
  * @param market

package/lib/math/funding.js

@@ -1,10 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateFundingPool = exports.calculateLongShortFundingRateAndLiveTwaps = exports.calculateLongShortFundingRate = exports.calculateEstimatedFundingRate = exports.calculateAllEstimatedFundingRate = void 0;
+exports.calculateFundingPool = exports.calculateLongShortFundingRateAndLiveTwaps = exports.calculateLongShortFundingRate = exports.calculateAllEstimatedFundingRate = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
 const amm_1 = require("./amm");
+const oracles_1 = require("./oracles");
+function calculateLiveMarkTwap(market, oraclePriceData, markPrice, now, period = new anchor_1.BN(3600)) {
+    now = now || new anchor_1.BN((Date.now() / 1000).toFixed(0));
+    const lastMarkTwapWithMantissa = market.amm.lastMarkPriceTwap;
+    const lastMarkPriceTwapTs = market.amm.lastMarkPriceTwapTs;
+    const timeSinceLastMarkChange = now.sub(lastMarkPriceTwapTs);
+    const markTwapTimeSinceLastUpdate = anchor_1.BN.max(period, anchor_1.BN.max(numericConstants_1.ZERO, period.sub(timeSinceLastMarkChange)));
+    if (!markPrice) {
+        const [bid, ask] = (0, amm_1.calculateBidAskPrice)(market.amm, oraclePriceData);
+        markPrice = bid.add(ask).div(new anchor_1.BN(2));
+    }
+    const markTwapWithMantissa = markTwapTimeSinceLastUpdate
+        .mul(lastMarkTwapWithMantissa)
+        .add(timeSinceLastMarkChange.mul(markPrice))
+        .div(timeSinceLastMarkChange.add(markTwapTimeSinceLastUpdate));
+    return markTwapWithMantissa;
+}
+function shrinkStaleTwaps(market, markTwapWithMantissa, oracleTwapWithMantissa, now) {
+    now = now || new anchor_1.BN((Date.now() / 1000).toFixed(0));
+    let newMarkTwap = markTwapWithMantissa;
+    let newOracleTwap = oracleTwapWithMantissa;
+    if (market.amm.lastMarkPriceTwapTs.gt(market.amm.historicalOracleData.lastOraclePriceTwapTs)) {
+        // shrink oracle based on invalid intervals
+        const oracleInvalidDuration = anchor_1.BN.max(numericConstants_1.ZERO, market.amm.lastMarkPriceTwapTs.sub(market.amm.historicalOracleData.lastOraclePriceTwapTs));
+        const timeSinceLastOracleTwapUpdate = now.sub(market.amm.historicalOracleData.lastOraclePriceTwapTs);
+        const oracleTwapTimeSinceLastUpdate = anchor_1.BN.max(numericConstants_1.ONE, anchor_1.BN.min(market.amm.fundingPeriod, anchor_1.BN.max(numericConstants_1.ONE, market.amm.fundingPeriod.sub(timeSinceLastOracleTwapUpdate))));
+        newOracleTwap = oracleTwapTimeSinceLastUpdate
+            .mul(oracleTwapWithMantissa)
+            .add(oracleInvalidDuration.mul(markTwapWithMantissa))
+            .div(oracleTwapTimeSinceLastUpdate.add(oracleInvalidDuration));
+    }
+    else if (market.amm.lastMarkPriceTwapTs.lt(market.amm.historicalOracleData.lastOraclePriceTwapTs)) {
+        // shrink mark to oracle twap over tradless intervals
+        const tradelessDuration = anchor_1.BN.max(numericConstants_1.ZERO, market.amm.historicalOracleData.lastOraclePriceTwapTs.sub(market.amm.lastMarkPriceTwapTs));
+        const timeSinceLastMarkTwapUpdate = now.sub(market.amm.lastMarkPriceTwapTs);
+        const markTwapTimeSinceLastUpdate = anchor_1.BN.max(numericConstants_1.ONE, anchor_1.BN.min(market.amm.fundingPeriod, anchor_1.BN.max(numericConstants_1.ONE, market.amm.fundingPeriod.sub(timeSinceLastMarkTwapUpdate))));
+        newMarkTwap = markTwapTimeSinceLastUpdate
+            .mul(markTwapWithMantissa)
+            .add(tradelessDuration.mul(oracleTwapWithMantissa))
+            .div(markTwapTimeSinceLastUpdate.add(tradelessDuration));
+    }
+    return [newMarkTwap, newOracleTwap];
+}
 /**
  *
  * @param market
@@ -12,76 +55,38 @@ const amm_1 = require("./amm");
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-async function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1), now) {
-    // periodAdjustment
-    // 	1: hourly
-    //  24: daily
-    //  24 * 365.25: annualized
-    const secondsInHour = new anchor_1.BN(3600);
-    const hoursInDay = new anchor_1.BN(24);
-    const ONE = new anchor_1.BN(1);
+async function calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now) {
     if ((0, types_1.isVariant)(market.status, 'uninitialized')) {
         return [numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO];
     }
-    const payFreq = new anchor_1.BN(market.amm.fundingPeriod);
     // todo: sufficiently differs from blockchain timestamp?
     now = now || new anchor_1.BN((Date.now() / 1000).toFixed(0));
-    const timeSinceLastUpdate = now.sub(market.amm.lastFundingRateTs);
-    // calculate real-time mark twap
-    const lastMarkTwapWithMantissa = market.amm.lastMarkPriceTwap;
-    const lastMarkPriceTwapTs = market.amm.lastMarkPriceTwapTs;
-    const timeSinceLastMarkChange = now.sub(lastMarkPriceTwapTs);
-    const markTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, anchor_1.BN.max(numericConstants_1.ZERO, secondsInHour.sub(timeSinceLastMarkChange)));
-    const [bid, ask] = (0, amm_1.calculateBidAskPrice)(market.amm, oraclePriceData);
-    const baseAssetPriceWithMantissa = bid.add(ask).div(new anchor_1.BN(2));
-    const markTwapWithMantissa = markTwapTimeSinceLastUpdate
-        .mul(lastMarkTwapWithMantissa)
-        .add(timeSinceLastMarkChange.mul(baseAssetPriceWithMantissa))
-        .div(timeSinceLastMarkChange.add(markTwapTimeSinceLastUpdate));
-    // calculate real-time (predicted) oracle twap
-    // note: oracle twap depends on `when the chord is struck` (market is trade)
-    const lastOracleTwapWithMantissa = market.amm.historicalOracleData.lastOraclePriceTwap;
-    const lastOraclePriceTwapTs = market.amm.historicalOracleData.lastOraclePriceTwapTs;
-    const oracleInvalidDuration = anchor_1.BN.max(numericConstants_1.ZERO, lastMarkPriceTwapTs.sub(lastOraclePriceTwapTs));
-    const timeSinceLastOracleTwapUpdate = now.sub(lastOraclePriceTwapTs);
-    const oracleTwapTimeSinceLastUpdate = anchor_1.BN.max(ONE, anchor_1.BN.min(secondsInHour, anchor_1.BN.max(ONE, secondsInHour.sub(timeSinceLastOracleTwapUpdate))));
-    let oracleTwapWithMantissa = lastOracleTwapWithMantissa;
-    // if passing live oracle data, improve predicted calc estimate
-    if (oraclePriceData) {
-        const oraclePrice = oraclePriceData.price;
-        const oracleLiveVsTwap = oraclePrice
-            .sub(lastOracleTwapWithMantissa)
-            .abs()
-            .mul(numericConstants_1.PRICE_PRECISION)
-            .mul(new anchor_1.BN(100))
-            .div(lastOracleTwapWithMantissa);
-        // verify pyth live input is within 20% of last twap for live update
-        if (oracleLiveVsTwap.lte(numericConstants_1.PRICE_PRECISION.mul(new anchor_1.BN(20)))) {
-            oracleTwapWithMantissa = oracleTwapTimeSinceLastUpdate
-                .mul(lastOracleTwapWithMantissa)
-                .add(timeSinceLastMarkChange.mul(oraclePrice))
-                .div(timeSinceLastMarkChange.add(oracleTwapTimeSinceLastUpdate));
-        }
-    }
-    const shrunkLastOracleTwapwithMantissa = oracleTwapTimeSinceLastUpdate
-        .mul(oracleTwapWithMantissa)
-        .add(oracleInvalidDuration.mul(lastMarkTwapWithMantissa))
-        .div(oracleTwapTimeSinceLastUpdate.add(oracleInvalidDuration));
-    const twapSpread = markTwapWithMantissa.sub(shrunkLastOracleTwapwithMantissa);
+    // calculate real-time mark and oracle twap
+    const liveMarkTwap = calculateLiveMarkTwap(market, oraclePriceData, markPrice, now, market.amm.fundingPeriod);
+    const liveOracleTwap = (0, oracles_1.calculateLiveOracleTwap)(market.amm.historicalOracleData, oraclePriceData, now, market.amm.fundingPeriod);
+    const [markTwap, oracleTwap] = shrinkStaleTwaps(market, liveMarkTwap, liveOracleTwap, now);
+    // if(!markTwap.eq(liveMarkTwap)){
+    // 	console.log('shrink mark:', liveMarkTwap.toString(), '->', markTwap.toString());
+    // }
+    // if(!oracleTwap.eq(liveOracleTwap)){
+    // 	console.log('shrink orac:', liveOracleTwap.toString(), '->', oracleTwap.toString());
+    // }
+    const twapSpread = markTwap.sub(oracleTwap);
     const twapSpreadPct = twapSpread
         .mul(numericConstants_1.PRICE_PRECISION)
         .mul(new anchor_1.BN(100))
-        .div(shrunkLastOracleTwapwithMantissa);
+        .div(oracleTwap);
+    const secondsInHour = new anchor_1.BN(3600);
+    const hoursInDay = new anchor_1.BN(24);
+    const timeSinceLastUpdate = now.sub(market.amm.lastFundingRateTs);
     const lowerboundEst = twapSpreadPct
-        .mul(payFreq)
+        .mul(market.amm.fundingPeriod)
         .mul(anchor_1.BN.min(secondsInHour, timeSinceLastUpdate))
-        .mul(periodAdjustment)
         .div(secondsInHour)
         .div(secondsInHour)
         .div(hoursInDay);
-    const interpEst = twapSpreadPct.mul(periodAdjustment).div(hoursInDay);
+    const interpEst = twapSpreadPct.div(hoursInDay);
     const interpRateQuote = twapSpreadPct
-        .mul(periodAdjustment)
         .div(hoursInDay)
         .div(numericConstants_1.PRICE_PRECISION.div(numericConstants_1.QUOTE_PRECISION));
     let feePoolSize = calculateFundingPool(market);
@@ -95,36 +100,18 @@ async function calculateAllEstimatedFundingRate(market, oraclePriceData, periodA
         largerSide = market.amm.baseAssetAmountLong.abs();
         smallerSide = market.amm.baseAssetAmountShort.abs();
         if (twapSpread.gt(new anchor_1.BN(0))) {
-            return [
-                markTwapWithMantissa,
-                oracleTwapWithMantissa,
-                lowerboundEst,
-                interpEst,
-                interpEst,
-            ];
+            return [markTwap, oracleTwap, lowerboundEst, interpEst, interpEst];
         }
     }
     else if (market.amm.baseAssetAmountLong.lt(market.amm.baseAssetAmountShort.abs())) {
         largerSide = market.amm.baseAssetAmountShort.abs();
         smallerSide = market.amm.baseAssetAmountLong.abs();
         if (twapSpread.lt(new anchor_1.BN(0))) {
-            return [
-                markTwapWithMantissa,
-                oracleTwapWithMantissa,
-                lowerboundEst,
-                interpEst,
-                interpEst,
-            ];
+            return [markTwap, oracleTwap, lowerboundEst, interpEst, interpEst];
         }
     }
     else {
-        return [
-            markTwapWithMantissa,
-            oracleTwapWithMantissa,
-            lowerboundEst,
-            interpEst,
-            interpEst,
-        ];
+        return [markTwap, oracleTwap, lowerboundEst, interpEst, interpEst];
     }
     if (largerSide.gt(numericConstants_1.ZERO)) {
         // funding smaller flow
@@ -136,8 +123,7 @@ async function calculateAllEstimatedFundingRate(market, oraclePriceData, periodA
         cappedAltEst = cappedAltEst
             .mul(numericConstants_1.PRICE_PRECISION)
             .mul(new anchor_1.BN(100))
-            .div(oracleTwapWithMantissa)
-            .mul(periodAdjustment);
+            .div(oracleTwap);
         if (cappedAltEst.abs().gte(interpEst.abs())) {
             cappedAltEst = interpEst;
         }
@@ -145,37 +131,9 @@ async function calculateAllEstimatedFundingRate(market, oraclePriceData, periodA
     else {
         cappedAltEst = interpEst;
     }
-    return [
-        markTwapWithMantissa,
-        oracleTwapWithMantissa,
-        lowerboundEst,
-        cappedAltEst,
-        interpEst,
-    ];
+    return [markTwap, oracleTwap, lowerboundEst, cappedAltEst, interpEst];
 }
 exports.calculateAllEstimatedFundingRate = calculateAllEstimatedFundingRate;
-/**
- *
- * @param market
- * @param oraclePriceData
- * @param periodAdjustment
- * @param estimationMethod
- * @returns Estimated funding rate. : Precision //TODO-PRECISION
- */
-async function calculateEstimatedFundingRate(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1), estimationMethod) {
-    const [_1, _2, lowerboundEst, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment);
-    if (estimationMethod == 'lowerbound') {
-        //assuming remaining funding period has no gap
-        return lowerboundEst;
-    }
-    else if (estimationMethod == 'capped') {
-        return cappedAltEst;
-    }
-    else {
-        return interpEst;
-    }
-}
-exports.calculateEstimatedFundingRate = calculateEstimatedFundingRate;
 /**
  *
  * @param market
@@ -183,8 +141,8 @@ exports.calculateEstimatedFundingRate = calculateEstimatedFundingRate;
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-async function calculateLongShortFundingRate(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1)) {
-    const [_1, _2, _, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment);
+async function calculateLongShortFundingRate(market, oraclePriceData, markPrice, now) {
+    const [_1, _2, _, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
     if (market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort)) {
         return [cappedAltEst, interpEst];
     }
@@ -203,8 +161,8 @@ exports.calculateLongShortFundingRate = calculateLongShortFundingRate;
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-async function calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1)) {
-    const [markTwapLive, oracleTwapLive, _2, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment);
+async function calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, markPrice, now) {
+    const [markTwapLive, oracleTwapLive, _2, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, markPrice, now);
     if (market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort.abs())) {
         return [markTwapLive, oracleTwapLive, cappedAltEst, interpEst];
     }

package/lib/user.d.ts

@@ -190,10 +190,11 @@ export declare class User {
     getTotalAssetValue(marginCategory?: MarginCategory): BN;
     /**
      * calculates max allowable leverage exceeding hitting requirement category
+     * for large sizes where imf factor activates, result is a lower bound
      * @params category {Initial, Maintenance}
      * @returns : Precision TEN_THOUSAND
      */
-    getMaxLeverageForPerp(perpMarketIndex: number, category?: MarginCategory): BN;
+    getMaxLeverageForPerp(perpMarketIndex: number, marginCategory?: MarginCategory): BN;
     /**
      * calculates max allowable leverage exceeding hitting requirement category
      * @param spotMarketIndex

package/lib/user.js

@@ -791,11 +791,13 @@ class User {
     }
     /**
      * calculates max allowable leverage exceeding hitting requirement category
+     * for large sizes where imf factor activates, result is a lower bound
      * @params category {Initial, Maintenance}
      * @returns : Precision TEN_THOUSAND
      */
-    getMaxLeverageForPerp(perpMarketIndex, category = 'Initial') {
+    getMaxLeverageForPerp(perpMarketIndex, marginCategory = 'Initial') {
         const market = this.driftClient.getPerpMarketAccount(perpMarketIndex);
+        const marketPrice = this.driftClient.getOracleDataForPerpMarket(perpMarketIndex).price;
         const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents();
         const totalAssetValue = spotAssetValue.add(perpPnl);
         const netAssetValue = totalAssetValue.sub(spotLiabilityValue);
@@ -803,9 +805,40 @@ class User {
             return numericConstants_1.ZERO;
         }
         const totalLiabilityValue = perpLiabilityValue.add(spotLiabilityValue);
-        const marginRatio = (0, _1.calculateMarketMarginRatio)(market, numericConstants_1.ZERO, // todo
-        category);
         const freeCollateral = this.getFreeCollateral();
+        let rawMarginRatio;
+        switch (marginCategory) {
+            case 'Initial':
+                rawMarginRatio = market.marginRatioInitial;
+                break;
+            case 'Maintenance':
+                rawMarginRatio = market.marginRatioMaintenance;
+                break;
+            default:
+                rawMarginRatio = market.marginRatioInitial;
+                break;
+        }
+        // absolute max fesible size (upper bound)
+        const maxSize = _1.BN.max(numericConstants_1.ZERO, freeCollateral
+            .mul(numericConstants_1.MARGIN_PRECISION)
+            .div(new _1.BN(rawMarginRatio))
+            .mul(numericConstants_1.PRICE_PRECISION)
+            .div(marketPrice));
+        // margin ratio incorporting upper bound on size
+        let marginRatio = (0, _1.calculateMarketMarginRatio)(market, maxSize, marginCategory);
+        // use more fesible size since imf factor activated
+        let attempts = 0;
+        while (marginRatio > rawMarginRatio + 1e-4 && attempts < 10) {
+            // more fesible size (upper bound)
+            const targetSize = _1.BN.max(numericConstants_1.ZERO, freeCollateral
+                .mul(numericConstants_1.MARGIN_PRECISION)
+                .div(new _1.BN(marginRatio))
+                .mul(numericConstants_1.PRICE_PRECISION)
+                .div(marketPrice));
+            // margin ratio incorporting more fesible target size
+            marginRatio = (0, _1.calculateMarketMarginRatio)(market, targetSize, marginCategory);
+            attempts += 1;
+        }
         // how much more liabilities can be opened w remaining free collateral
         const additionalLiabilities = freeCollateral
             .mul(numericConstants_1.MARGIN_PRECISION)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.34.1-beta.2",
+	"version": "2.34.1-beta.4",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -53,6 +53,7 @@
 		"eslint": "^7.29.0",
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-prettier": "^3.4.0",
+		"lodash": "^4.17.21",
 		"mocha": "^10.0.0",
 		"prettier": "^2.4.1",
 		"ts-node": "^10.8.0",

package/src/dlob/DLOB.ts

@@ -930,18 +930,9 @@ export class DLOB {
 		}
 
 		// All bids/asks that can expire
-		const bidGenerators = [
-			nodeLists.takingLimit.bid.getGenerator(),
-			nodeLists.restingLimit.bid.getGenerator(),
-			nodeLists.floatingLimit.bid.getGenerator(),
-			nodeLists.market.bid.getGenerator(),
-		];
-		const askGenerators = [
-			nodeLists.takingLimit.ask.getGenerator(),
-			nodeLists.restingLimit.ask.getGenerator(),
-			nodeLists.floatingLimit.ask.getGenerator(),
-			nodeLists.market.ask.getGenerator(),
-		];
+		// dont try to expire limit orders with tif as its inefficient use of blockspace
+		const bidGenerators = [nodeLists.market.bid.getGenerator()];
+		const askGenerators = [nodeLists.market.ask.getGenerator()];
 
 		for (const bidGenerator of bidGenerators) {
 			for (const bid of bidGenerator) {