@drift-labs/sdk 2.61.0-beta.1 → 2.61.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.61.0-beta.1
+2.61.0-beta.3

package/lib/math/exchangeStatus.js

@@ -7,15 +7,29 @@ function exchangePaused(state) {
 }
 exports.exchangePaused = exchangePaused;
 function fillPaused(state, market) {
-    return ((state.exchangeStatus & types_1.ExchangeStatus.FILL_PAUSED) ===
-        types_1.ExchangeStatus.FILL_PAUSED ||
-        (0, types_1.isOneOfVariant)(market.status, ['paused', 'fillPaused']));
+    if ((state.exchangeStatus & types_1.ExchangeStatus.FILL_PAUSED) ===
+        types_1.ExchangeStatus.FILL_PAUSED) {
+        return true;
+    }
+    if (market.hasOwnProperty('amm')) {
+        return isOperationPaused(market.pausedOperations, types_1.PerpOperation.FILL);
+    }
+    else {
+        return isOperationPaused(market.pausedOperations, types_1.SpotOperation.FILL);
+    }
 }
 exports.fillPaused = fillPaused;
 function ammPaused(state, market) {
-    return ((state.exchangeStatus & types_1.ExchangeStatus.AMM_PAUSED) ===
-        types_1.ExchangeStatus.AMM_PAUSED ||
-        (0, types_1.isOneOfVariant)(market.status, ['paused', 'ammPaused']));
+    if ((state.exchangeStatus & types_1.ExchangeStatus.AMM_PAUSED) ===
+        types_1.ExchangeStatus.AMM_PAUSED) {
+        return true;
+    }
+    if (market.hasOwnProperty('amm')) {
+        return isOperationPaused(market.pausedOperations, types_1.PerpOperation.AMM_FILL);
+    }
+    else {
+        return false;
+    }
 }
 exports.ammPaused = ammPaused;
 function isOperationPaused(pausedOperations, operation) {

package/lib/math/orders.js

@@ -207,17 +207,6 @@ function isRestingLimitOrder(order, slot) {
     if (!isLimitOrder(order)) {
         return false;
     }
-    if ((0, types_1.isVariant)(order.orderType, 'triggerLimit')) {
-        if ((0, types_1.isVariant)(order.direction, 'long') &&
-            order.triggerPrice.lt(order.price)) {
-            return false;
-        }
-        else if ((0, types_1.isVariant)(order.direction, 'short') &&
-            order.triggerPrice.gt(order.price)) {
-            return false;
-        }
-        return (0, auction_1.isAuctionComplete)(order, slot);
-    }
     return order.postOnly || (0, auction_1.isAuctionComplete)(order, slot);
 }
 exports.isRestingLimitOrder = isRestingLimitOrder;

package/lib/oracles/pythClient.js

@@ -17,6 +17,7 @@ class PythClient {
     getOraclePriceDataFromBuffer(buffer) {
         const priceData = (0, client_1.parsePriceData)(buffer);
         const confidence = convertPythPrice(priceData.confidence, priceData.exponent, this.multiple);
+        const minPublishers = Math.min(priceData.numComponentPrices, 3);
         let price = convertPythPrice(priceData.aggregate.price, priceData.exponent, this.multiple);
         if (this.stableCoin) {
             price = getStableCoinPrice(price, confidence);
@@ -27,7 +28,7 @@ class PythClient {
             confidence,
             twap: convertPythPrice(priceData.twap.value, priceData.exponent, this.multiple),
             twapConfidence: convertPythPrice(priceData.twac.value, priceData.exponent, this.multiple),
-            hasSufficientNumberOfDataPoints: true,
+            hasSufficientNumberOfDataPoints: priceData.numQuoters >= minPublishers,
         };
     }
 }

package/lib/types.d.ts

@@ -689,6 +689,7 @@ export type PerpMarketAccount = {
     };
     quoteSpotMarketIndex: number;
     feeAdjustment: number;
+    pausedOperations: number;
 };
 export type HistoricalOracleData = {
     lastOraclePrice: BN;
@@ -766,6 +767,7 @@ export type SpotMarketAccount = {
     flashLoanAmount: BN;
     flashLoanInitialTokenAmount: BN;
     ordersEnabled: boolean;
+    pausedOperations: number;
 };
 export type PoolBalance = {
     scaledBalance: BN;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.61.0-beta.1",
+	"version": "2.61.0-beta.3",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/math/exchangeStatus.ts

@@ -1,6 +1,5 @@
 import {
 	ExchangeStatus,
-	isOneOfVariant,
 	PerpMarketAccount,
 	PerpOperation,
 	SpotMarketAccount,
@@ -16,22 +15,36 @@ export function fillPaused(
 	state: StateAccount,
 	market: PerpMarketAccount | SpotMarketAccount
 ): boolean {
-	return (
+	if (
 		(state.exchangeStatus & ExchangeStatus.FILL_PAUSED) ===
-			ExchangeStatus.FILL_PAUSED ||
-		isOneOfVariant(market.status, ['paused', 'fillPaused'])
-	);
+		ExchangeStatus.FILL_PAUSED
+	) {
+		return true;
+	}
+
+	if (market.hasOwnProperty('amm')) {
+		return isOperationPaused(market.pausedOperations, PerpOperation.FILL);
+	} else {
+		return isOperationPaused(market.pausedOperations, SpotOperation.FILL);
+	}
 }
 
 export function ammPaused(
 	state: StateAccount,
 	market: PerpMarketAccount | SpotMarketAccount
 ): boolean {
-	return (
+	if (
 		(state.exchangeStatus & ExchangeStatus.AMM_PAUSED) ===
-			ExchangeStatus.AMM_PAUSED ||
-		isOneOfVariant(market.status, ['paused', 'ammPaused'])
-	);
+		ExchangeStatus.AMM_PAUSED
+	) {
+		return true;
+	}
+
+	if (market.hasOwnProperty('amm')) {
+		return isOperationPaused(market.pausedOperations, PerpOperation.AMM_FILL);
+	} else {
+		return false;
+	}
 }
 
 export function isOperationPaused(

package/src/math/orders.ts

@@ -331,22 +331,6 @@ export function isRestingLimitOrder(order: Order, slot: number): boolean {
 		return false;
 	}
 
-	if (isVariant(order.orderType, 'triggerLimit')) {
-		if (
-			isVariant(order.direction, 'long') &&
-			order.triggerPrice.lt(order.price)
-		) {
-			return false;
-		} else if (
-			isVariant(order.direction, 'short') &&
-			order.triggerPrice.gt(order.price)
-		) {
-			return false;
-		}
-
-		return isAuctionComplete(order, slot);
-	}
-
 	return order.postOnly || isAuctionComplete(order, slot);
 }
 

package/src/oracles/pythClient.ts

@@ -38,6 +38,7 @@ export class PythClient implements OracleClient {
 			priceData.exponent,
 			this.multiple
 		);
+		const minPublishers = Math.min(priceData.numComponentPrices, 3);
 		let price = convertPythPrice(
 			priceData.aggregate.price,
 			priceData.exponent,
@@ -61,7 +62,7 @@ export class PythClient implements OracleClient {
 				priceData.exponent,
 				this.multiple
 			),
-			hasSufficientNumberOfDataPoints: true,
+			hasSufficientNumberOfDataPoints: priceData.numQuoters >= minPublishers,
 		};
 	}
 }

package/src/types.ts

@@ -609,6 +609,7 @@ export type PerpMarketAccount = {
 	};
 	quoteSpotMarketIndex: number;
 	feeAdjustment: number;
+	pausedOperations: number;
 };
 
 export type HistoricalOracleData = {
@@ -700,6 +701,8 @@ export type SpotMarketAccount = {
 	flashLoanInitialTokenAmount: BN;
 
 	ordersEnabled: boolean;
+
+	pausedOperations: number;
 };
 
 export type PoolBalance = {

package/tests/dlob/test.ts

@@ -28,7 +28,6 @@ import {
 
 import { mockPerpMarkets, mockSpotMarkets, mockStateAccount } from './helpers';
 import { DLOBOrdersCoder } from '../../src/dlob/DLOBOrders';
-import { isAuctionComplete, isRestingLimitOrder } from '../../lib';
 
 function insertOrderToDLOB(
 	dlob: DLOB,
@@ -2698,60 +2697,6 @@ describe('DLOB Perp Tests', () => {
 		}
 	});
 
-	it('Test trigger limit isnt maker', () => {
-		const vAsk = new BN(15);
-		const vBid = new BN(8);
-
-		const user0 = Keypair.generate();
-
-		const dlob = new DLOB();
-		const marketIndex = 0;
-
-		const slot = 20;
-		const oracle = {
-			price: vBid.add(vAsk).div(new BN(2)),
-			slot: new BN(slot),
-			confidence: new BN(1),
-			hasSufficientNumberOfDataPoints: true,
-		};
-
-		// should trigger limit buy with above condition
-		insertTriggerOrderToDLOB(
-			dlob,
-			user0.publicKey,
-			OrderType.TRIGGER_LIMIT,
-			MarketType.PERP,
-			1, //orderId
-			marketIndex, // marketIndex
-			oracle.price.add(new BN(1)), // price
-			BASE_PRECISION, // baseAssetAmount: BN,
-			PositionDirection.LONG,
-			oracle.price.sub(new BN(1)), // triggerPrice: BN,
-			OrderTriggerCondition.TRIGGERED_ABOVE, // triggerCondition: OrderTriggerCondition,
-			vBid,
-			vAsk,
-			new BN(1) // slot
-		);
-
-		const restingLimitBids = Array.from(
-			dlob.getRestingLimitBids(marketIndex, slot, MarketType.PERP, oracle)
-		);
-		expect(restingLimitBids.length).to.equal(0);
-
-		const takingBids = Array.from(
-			dlob.getTakingBids(marketIndex, MarketType.PERP, slot, oracle)
-		);
-		expect(takingBids.length).to.equal(1);
-		const triggerLimitBid = takingBids[0];
-		expect(triggerLimitBid !== undefined);
-		expect(isAuctionComplete(triggerLimitBid.order as Order, slot)).to.equal(
-			true
-		);
-		expect(isRestingLimitOrder(triggerLimitBid.order as Order, slot)).to.equal(
-			false
-		);
-	});
-
 	it('Test will return expired market orders to fill', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);