@drift-labs/sdk 2.0.13 → 2.0.15

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/idl/drift.json

@@ -1432,7 +1432,7 @@
         },
         {
           "name": "spotMarket",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {
@@ -3233,6 +3233,48 @@
         }
       ]
     },
+    {
+      "name": "updateInitialPctToLiquidate",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "initialPctToLiquidate",
+          "type": "u16"
+        }
+      ]
+    },
+    {
+      "name": "updateLiquidationDuration",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "liquidationDuration",
+          "type": "u8"
+        }
+      ]
+    },
     {
       "name": "updateOracleGuardRails",
       "accounts": [
@@ -4320,12 +4362,20 @@
               "defined": "ExchangeStatus"
             }
           },
+          {
+            "name": "liquidationDuration",
+            "type": "u8"
+          },
+          {
+            "name": "initialPctToLiquidate",
+            "type": "u16"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                17
+                14
               ]
             }
           }
@@ -4420,8 +4470,8 @@
             "type": "u64"
           },
           {
-            "name": "liquidationStartTs",
-            "type": "i64"
+            "name": "liquidationStartSlot",
+            "type": "u64"
           },
           {
             "name": "nextOrderId",
@@ -5596,11 +5646,11 @@
             "type": "u64"
           },
           {
-            "name": "lastNetBaseAssetAmountPerLp",
+            "name": "lastBaseAssetAmountPerLp",
             "type": "i64"
           },
           {
-            "name": "lastNetQuoteAssetAmountPerLp",
+            "name": "lastQuoteAssetAmountPerLp",
             "type": "i64"
           },
           {
@@ -6016,6 +6066,9 @@
           },
           {
             "name": "OrderFillWithSerum"
+          },
+          {
+            "name": "NoBorrowLiquidity"
           }
         ]
       }
@@ -8454,11 +8507,16 @@
     },
     {
       "code": 6219,
+      "name": "UnableToGetLimitPrice",
+      "msg": "Unable To Get Limit Price"
+    },
+    {
+      "code": 6220,
       "name": "InvalidLiquidation",
       "msg": "Invalid Liquidation"
     },
     {
-      "code": 6220,
+      "code": 6221,
       "name": "SpotFulfillmentConfigDisabled",
       "msg": "Spot Fulfullment Config Disabled"
     }

package/src/math/amm.ts

@@ -10,6 +10,8 @@ import {
 	QUOTE_PRECISION,
 	MARGIN_PRECISION,
 	PRICE_DIV_PEG,
+	PERCENTAGE_PRECISION,
+	BASE_PRECISION,
 } from '../constants/numericConstants';
 import {
 	AMM,
@@ -19,7 +21,7 @@ import {
 	isVariant,
 } from '../types';
 import { assert } from '../assert/assert';
-import { squareRootBN, standardizeBaseAssetAmount } from '..';
+import { squareRootBN, clampBN, standardizeBaseAssetAmount } from '..';
 
 import { OraclePriceData } from '../oracles/types';
 import {
@@ -28,6 +30,8 @@ import {
 	calculateBudgetedPeg,
 } from './repeg';
 
+import { calculateLiveOracleStd } from './oracles';
+
 export function calculatePegFromTargetPrice(
 	targetPrice: BN,
 	baseAssetReserve: BN,
@@ -63,7 +67,8 @@ export function calculateOptimalPegAndBudget(
 	const totalFeeLB = amm.totalExchangeFee.div(new BN(2));
 	const budget = BN.max(ZERO, amm.totalFeeMinusDistributions.sub(totalFeeLB));
 	if (budget.lt(prePegCost)) {
-		const maxPriceSpread = new BN(amm.maxSpread)
+		const halfMaxPriceSpread = new BN(amm.maxSpread)
+			.div(new BN(2))
 			.mul(targetPrice)
 			.div(BID_ASK_SPREAD_PRECISION);
 
@@ -72,8 +77,8 @@ export function calculateOptimalPegAndBudget(
 		let newBudget: BN;
 		const targetPriceGap = reservePriceBefore.sub(targetPrice);
 
-		if (targetPriceGap.abs().gt(maxPriceSpread)) {
-			const markAdj = targetPriceGap.abs().sub(maxPriceSpread);
+		if (targetPriceGap.abs().gt(halfMaxPriceSpread)) {
+			const markAdj = targetPriceGap.abs().sub(halfMaxPriceSpread);
 
 			if (targetPriceGap.lt(new BN(0))) {
 				newTargetPrice = reservePriceBefore.add(markAdj);
@@ -173,6 +178,8 @@ export function calculateUpdatedAMM(
 
 	newAmm.totalFeeMinusDistributions =
 		newAmm.totalFeeMinusDistributions.sub(prepegCost);
+	newAmm.netRevenueSinceLastFunding =
+		newAmm.netRevenueSinceLastFunding.sub(prepegCost);
 
 	return newAmm;
 }
@@ -315,14 +322,14 @@ export function calculateMarketOpenBidAsk(
 ): [BN, BN] {
 	// open orders
 	let openAsks;
-	if (maxBaseAssetReserve > baseAssetReserve) {
+	if (maxBaseAssetReserve.gt(baseAssetReserve)) {
 		openAsks = maxBaseAssetReserve.sub(baseAssetReserve).mul(new BN(-1));
 	} else {
 		openAsks = ZERO;
 	}
 
 	let openBids;
-	if (minBaseAssetReserve < baseAssetReserve) {
+	if (minBaseAssetReserve.lt(baseAssetReserve)) {
 		openBids = baseAssetReserve.sub(minBaseAssetReserve);
 	} else {
 		openBids = ZERO;
@@ -331,12 +338,18 @@ export function calculateMarketOpenBidAsk(
 }
 
 export function calculateInventoryScale(
-	netBaseAssetAmount: BN,
+	baseAssetAmountWithAmm: BN,
 	baseAssetReserve: BN,
 	minBaseAssetReserve: BN,
-	maxBaseAssetReserve: BN
+	maxBaseAssetReserve: BN,
+	directionalSpread: number,
+	maxSpread: number
 ): number {
-	const maxScale = BID_ASK_SPREAD_PRECISION.mul(new BN(10));
+	if (baseAssetAmountWithAmm.eq(ZERO)) {
+		return 0;
+	}
+
+	const defaultLargeBidAskFactor = BID_ASK_SPREAD_PRECISION.mul(new BN(10));
 	// inventory skew
 	const [openBids, openAsks] = calculateMarketOpenBidAsk(
 		baseAssetReserve,
@@ -348,13 +361,27 @@ export function calculateInventoryScale(
 		new BN(1),
 		BN.min(openBids.abs(), openAsks.abs())
 	);
-	const inventoryScale =
-		BN.min(
-			maxScale,
-			netBaseAssetAmount.mul(maxScale).div(minSideLiquidity).abs()
+
+	const inventoryScaleMax =
+		BN.max(
+			defaultLargeBidAskFactor,
+			new BN(maxSpread / 2)
+				.mul(BID_ASK_SPREAD_PRECISION)
+				.div(new BN(Math.max(directionalSpread, 1)))
 		).toNumber() / BID_ASK_SPREAD_PRECISION.toNumber();
 
-	return inventoryScale;
+	const inventoryScale =
+		baseAssetAmountWithAmm
+			.mul(BN.max(baseAssetAmountWithAmm.abs(), BASE_PRECISION))
+			.div(BASE_PRECISION)
+			.mul(defaultLargeBidAskFactor)
+			.div(minSideLiquidity)
+			.abs()
+			.toNumber() / BID_ASK_SPREAD_PRECISION.toNumber();
+
+	const inventorySpreadScale = Math.min(inventoryScaleMax, 1 + inventoryScale);
+
+	return inventorySpreadScale;
 }
 
 export function calculateEffectiveLeverage(
@@ -392,6 +419,47 @@ export function calculateMaxSpread(marginRatioInitial: number): number {
 	return maxTargetSpread;
 }
 
+export function calculateVolSpreadBN(
+	lastOracleConfPct: BN,
+	reservePrice: BN,
+	markStd: BN,
+	oracleStd: BN,
+	longIntensity: BN,
+	shortIntensity: BN,
+	volume24H: BN
+): [BN, BN] {
+	const marketAvgStdPct = markStd
+		.add(oracleStd)
+		.mul(PERCENTAGE_PRECISION)
+		.div(reservePrice.mul(new BN(2)));
+	const volSpread = BN.max(lastOracleConfPct, marketAvgStdPct.div(new BN(2)));
+
+	const clampMax = PERCENTAGE_PRECISION.mul(new BN(16)).div(new BN(10));
+	const clampMin = PERCENTAGE_PRECISION.div(new BN(10));
+
+	const longVolSpreadFactor = clampBN(
+		longIntensity.mul(PERCENTAGE_PRECISION).div(BN.max(ONE, volume24H)),
+		clampMin,
+		clampMax
+	);
+	const shortVolSpreadFactor = clampBN(
+		shortIntensity.mul(PERCENTAGE_PRECISION).div(BN.max(ONE, volume24H)),
+		clampMin,
+		clampMax
+	);
+
+	const longVolSpread = BN.max(
+		lastOracleConfPct,
+		volSpread.mul(longVolSpreadFactor).div(PERCENTAGE_PRECISION)
+	);
+	const shortVolSpread = BN.max(
+		lastOracleConfPct,
+		volSpread.mul(shortVolSpreadFactor).div(PERCENTAGE_PRECISION)
+	);
+
+	return [longVolSpread, shortVolSpread];
+}
+
 export function calculateSpreadBN(
 	baseSpread: number,
 	lastOracleReservePriceSpreadPct: BN,
@@ -400,27 +468,42 @@ export function calculateSpreadBN(
 	quoteAssetReserve: BN,
 	terminalQuoteAssetReserve: BN,
 	pegMultiplier: BN,
-	netBaseAssetAmount: BN,
+	baseAssetAmountWithAmm: BN,
 	reservePrice: BN,
 	totalFeeMinusDistributions: BN,
 	baseAssetReserve: BN,
 	minBaseAssetReserve: BN,
-	maxBaseAssetReserve: BN
+	maxBaseAssetReserve: BN,
+	markStd: BN,
+	oracleStd: BN,
+	longIntensity: BN,
+	shortIntensity: BN,
+	volume24H: BN
 ): [number, number] {
-	let longSpread = baseSpread / 2;
-	let shortSpread = baseSpread / 2;
+	const [longVolSpread, shortVolSpread] = calculateVolSpreadBN(
+		lastOracleConfPct,
+		reservePrice,
+		markStd,
+		oracleStd,
+		longIntensity,
+		shortIntensity,
+		volume24H
+	);
+
+	let longSpread = Math.max(baseSpread / 2, longVolSpread.toNumber());
+	let shortSpread = Math.max(baseSpread / 2, shortVolSpread.toNumber());
 
-	if (lastOracleReservePriceSpreadPct.gte(ZERO)) {
+	if (lastOracleReservePriceSpreadPct.gt(ZERO)) {
 		shortSpread = Math.max(
 			shortSpread,
 			lastOracleReservePriceSpreadPct.abs().toNumber() +
-				lastOracleConfPct.toNumber()
+				shortVolSpread.toNumber()
 		);
 	} else if (lastOracleReservePriceSpreadPct.lt(ZERO)) {
 		longSpread = Math.max(
 			longSpread,
 			lastOracleReservePriceSpreadPct.abs().toNumber() +
-				lastOracleConfPct.toNumber()
+				longVolSpread.toNumber()
 		);
 	}
 
@@ -429,22 +512,18 @@ export function calculateSpreadBN(
 		lastOracleReservePriceSpreadPct.abs().toNumber()
 	);
 
-	const MAX_BID_ASK_INVENTORY_SKEW_FACTOR = 10;
-
-	const inventoryScale = calculateInventoryScale(
-		netBaseAssetAmount,
+	const inventorySpreadScale = calculateInventoryScale(
+		baseAssetAmountWithAmm,
 		baseAssetReserve,
 		minBaseAssetReserve,
-		maxBaseAssetReserve
-	);
-	const inventorySpreadScale = Math.min(
-		MAX_BID_ASK_INVENTORY_SKEW_FACTOR,
-		1 + inventoryScale
+		maxBaseAssetReserve,
+		baseAssetAmountWithAmm.gt(ZERO) ? longSpread : shortSpread,
+		maxTargetSpread
 	);
 
-	if (netBaseAssetAmount.gt(ZERO)) {
+	if (baseAssetAmountWithAmm.gt(ZERO)) {
 		longSpread *= inventorySpreadScale;
-	} else if (netBaseAssetAmount.lt(ZERO)) {
+	} else if (baseAssetAmountWithAmm.lt(ZERO)) {
 		shortSpread *= inventorySpreadScale;
 	}
 
@@ -453,24 +532,22 @@ export function calculateSpreadBN(
 		quoteAssetReserve,
 		terminalQuoteAssetReserve,
 		pegMultiplier,
-		netBaseAssetAmount,
+		baseAssetAmountWithAmm,
 		reservePrice,
 		totalFeeMinusDistributions
 	);
 
+	const MAX_SPREAD_SCALE = 10;
 	if (totalFeeMinusDistributions.gt(ZERO)) {
-		const spreadScale = Math.min(
-			MAX_BID_ASK_INVENTORY_SKEW_FACTOR,
-			1 + effectiveLeverage
-		);
-		if (netBaseAssetAmount.gt(ZERO)) {
+		const spreadScale = Math.min(MAX_SPREAD_SCALE, 1 + effectiveLeverage);
+		if (baseAssetAmountWithAmm.gt(ZERO)) {
 			longSpread *= spreadScale;
 		} else {
 			shortSpread *= spreadScale;
 		}
 	} else {
-		longSpread *= MAX_BID_ASK_INVENTORY_SKEW_FACTOR;
-		shortSpread *= MAX_BID_ASK_INVENTORY_SKEW_FACTOR;
+		longSpread *= MAX_SPREAD_SCALE;
+		shortSpread *= MAX_SPREAD_SCALE;
 	}
 
 	const totalSpread = longSpread + shortSpread;
@@ -504,7 +581,6 @@ export function calculateSpread(
 
 	const targetPrice = oraclePriceData?.price || reservePrice;
 	const confInterval = oraclePriceData.confidence || ZERO;
-
 	const targetMarkSpreadPct = reservePrice
 		.sub(targetPrice)
 		.mul(BID_ASK_SPREAD_PRECISION)
@@ -514,6 +590,9 @@ export function calculateSpread(
 		.mul(BID_ASK_SPREAD_PRECISION)
 		.div(reservePrice);
 
+	const now = new BN(new Date().getTime() / 1000); //todo
+	const liveOracleStd = calculateLiveOracleStd(amm, oraclePriceData, now);
+
 	const [longSpread, shortSpread] = calculateSpreadBN(
 		amm.baseSpread,
 		targetMarkSpreadPct,
@@ -527,7 +606,12 @@ export function calculateSpread(
 		amm.totalFeeMinusDistributions,
 		amm.baseAssetReserve,
 		amm.minBaseAssetReserve,
-		amm.maxBaseAssetReserve
+		amm.maxBaseAssetReserve,
+		amm.markStd,
+		liveOracleStd,
+		amm.longIntensityVolume,
+		amm.shortIntensityVolume,
+		amm.volume24H
 	);
 
 	let spread: number;

package/src/math/oracles.ts

@@ -88,3 +88,55 @@ export function isOracleTooDivergent(
 
 	return tooDivergent;
 }
+
+export function calculateLiveOracleTwap(
+	amm: AMM,
+	oraclePriceData: OraclePriceData,
+	now: BN
+): BN {
+	const sinceLastUpdate = now.sub(
+		amm.historicalOracleData.lastOraclePriceTwapTs
+	);
+	const sinceStart = BN.max(ZERO, amm.fundingPeriod.sub(sinceLastUpdate));
+
+	const clampRange = amm.historicalOracleData.lastOraclePriceTwap.div(
+		new BN(3)
+	);
+
+	const clampedOraclePrice = BN.min(
+		amm.historicalOracleData.lastOraclePriceTwap.add(clampRange),
+		BN.max(
+			oraclePriceData.price,
+			amm.historicalOracleData.lastOraclePriceTwap.sub(clampRange)
+		)
+	);
+
+	const newOracleTwap = amm.historicalOracleData.lastOraclePriceTwap
+		.mul(sinceStart)
+		.add(clampedOraclePrice)
+		.mul(sinceLastUpdate)
+		.div(sinceStart.add(sinceLastUpdate));
+
+	return newOracleTwap;
+}
+
+export function calculateLiveOracleStd(
+	amm: AMM,
+	oraclePriceData: OraclePriceData,
+	now: BN
+): BN {
+	const sinceLastUpdate = now.sub(
+		amm.historicalOracleData.lastOraclePriceTwapTs
+	);
+	const sinceStart = BN.max(ZERO, amm.fundingPeriod.sub(sinceLastUpdate));
+
+	const liveOracleTwap = calculateLiveOracleTwap(amm, oraclePriceData, now);
+
+	const priceDeltaVsTwap = oraclePriceData.price.sub(liveOracleTwap).abs();
+
+	const oracleStd = priceDeltaVsTwap.add(
+		amm.oracleStd.mul(sinceStart).div(sinceStart.add(sinceLastUpdate))
+	);
+
+	return oracleStd;
+}

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);

package/src/math/utils.ts

@@ -1,5 +1,9 @@
 import { BN } from '../';
 
+export function clampBN(x: BN, min: BN, max: BN): BN {
+	return BN.max(min, BN.min(x, max));
+}
+
 export const squareRootBN = (n, closeness = new BN(1)) => {
 	// Assuming the sqrt of n as n only
 	let x = n;

package/src/types.ts

@@ -519,6 +519,8 @@ export type StateAccount = {
 	perpFeeStructure: FeeStructure;
 	spotFeeStructure: FeeStructure;
 	lpCooldownTime: BN;
+	initialPctToLiquidate: number;
+	liquidationDuration: number;
 };
 
 export type PerpMarketAccount = {
@@ -745,8 +747,8 @@ export type PerpPosition = {
 	settledPnl: BN;
 	lpShares: BN;
 	remainderBaseAssetAmount: number;
-	lastNetBaseAssetAmountPerLp: BN;
-	lastNetQuoteAssetAmountPerLp: BN;
+	lastBaseAssetAmountPerLp: BN;
+	lastQuoteAssetAmountPerLp: BN;
 };
 
 export type UserStatsAccount = {
@@ -790,6 +792,8 @@ export type UserAccount = {
 	totalWithdraws: BN;
 	totalSocialLoss: BN;
 	cumulativePerpFunding: BN;
+	liquidationMarginFreed: BN;
+	liquidationStartSlot: BN;
 };
 
 export type SpotPosition = {