@drift-labs/sdk 2.0.13 → 2.0.14

package/src/driftClient.ts

@@ -300,12 +300,31 @@ export class DriftClient {
 		return this.accountSubscriber.getStateAccountAndSlot().data;
 	}
 
+	/**
+	 * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
+	 */
+	public async forceGetStateAccount(): Promise<StateAccount> {
+		await this.accountSubscriber.fetch();
+		return this.accountSubscriber.getStateAccountAndSlot().data;
+	}
+
 	public getPerpMarketAccount(
 		marketIndex: number
 	): PerpMarketAccount | undefined {
 		return this.accountSubscriber.getMarketAccountAndSlot(marketIndex)?.data;
 	}
 
+	/**
+	 * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
+	 * @param marketIndex
+	 */
+	public async forceGetPerpMarketAccount(
+		marketIndex: number
+	): Promise<PerpMarketAccount | undefined> {
+		await this.accountSubscriber.fetch();
+		return this.accountSubscriber.getMarketAccountAndSlot(marketIndex)?.data;
+	}
+
 	public getPerpMarketAccounts(): PerpMarketAccount[] {
 		return this.accountSubscriber
 			.getMarketAccountsAndSlots()
@@ -318,6 +337,17 @@ export class DriftClient {
 		return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
 	}
 
+	/**
+	 * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
+	 * @param marketIndex
+	 */
+	public async forceGetSpotMarketAccount(
+		marketIndex: number
+	): Promise<SpotMarketAccount | undefined> {
+		await this.accountSubscriber.fetch();
+		return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
+	}
+
 	public getSpotMarketAccounts(): SpotMarketAccount[] {
 		return this.accountSubscriber
 			.getSpotMarketAccountsAndSlots()
@@ -679,6 +709,17 @@ export class DriftClient {
 		return this.getUser(subAccountId).getUserAccount();
 	}
 
+	/**
+	 * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
+	 * @param subAccountId
+	 */
+	public async forceGetUserAccount(
+		subAccountId?: number
+	): Promise<UserAccount | undefined> {
+		await this.getUser(subAccountId).fetchAccounts();
+		return this.getUser(subAccountId).getUserAccount();
+	}
+
 	public getUserAccountAndSlot(
 		subAccountId?: number
 	): DataAndSlot<UserAccount> | undefined {

package/src/math/orders.ts

@@ -127,8 +127,9 @@ export function standardizeBaseAssetAmount(
 export function getLimitPrice(
 	order: Order,
 	oraclePriceData: OraclePriceData,
-	slot: number
-): BN {
+	slot: number,
+	fallbackPrice?: BN
+): BN | undefined {
 	let limitPrice;
 	if (order.oraclePriceOffset !== 0) {
 		limitPrice = oraclePriceData.price.add(new BN(order.oraclePriceOffset));
@@ -138,13 +139,7 @@ export function getLimitPrice(
 		} else if (!order.price.eq(ZERO)) {
 			limitPrice = order.price;
 		} else {
-			// check oracle validity?
-			const oraclePrice1Pct = oraclePriceData.price.div(new BN(100));
-			if (isVariant(order.direction, 'long')) {
-				limitPrice = oraclePriceData.price.add(oraclePrice1Pct);
-			} else {
-				limitPrice = oraclePriceData.price.sub(oraclePrice1Pct);
-			}
+			limitPrice = fallbackPrice;
 		}
 	} else {
 		limitPrice = order.price;
@@ -153,18 +148,6 @@ export function getLimitPrice(
 	return limitPrice;
 }
 
-export function getOptionalLimitPrice(
-	order: Order,
-	oraclePriceData: OraclePriceData,
-	slot: number
-): BN | undefined {
-	if (hasLimitPrice(order, slot)) {
-		return getLimitPrice(order, oraclePriceData, slot);
-	} else {
-		return undefined;
-	}
-}
-
 export function hasLimitPrice(order: Order, slot: number): boolean {
 	return (
 		order.price.gt(ZERO) ||
@@ -202,7 +185,7 @@ export function calculateBaseAssetAmountForAmmToFulfill(
 		return ZERO;
 	}
 
-	const limitPrice = getOptionalLimitPrice(order, oraclePriceData, slot);
+	const limitPrice = getLimitPrice(order, oraclePriceData, slot);
 	let baseAssetAmount;
 
 	const updatedAMM = calculateUpdatedAMM(market.amm, oraclePriceData);