Merge branch 'master' into bigz/initial-margin-hlm-imf

Author: crispheaney

programs/drift/src/math/amm_spread.rs

@@ -12,8 +12,8 @@ use crate::math::constants::{
     BID_ASK_SPREAD_PRECISION, BID_ASK_SPREAD_PRECISION_I128, DEFAULT_LARGE_BID_ASK_FACTOR,
     DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT, FUNDING_RATE_BUFFER,
     MAX_BID_ASK_INVENTORY_SKEW_FACTOR, PEG_PRECISION, PERCENTAGE_PRECISION,
-    PERCENTAGE_PRECISION_I128, PERCENTAGE_PRECISION_I64, PERCENTAGE_PRECISION_U64, PRICE_PRECISION,
-    PRICE_PRECISION_I128, PRICE_PRECISION_I64,
+    PERCENTAGE_PRECISION_I128, PERCENTAGE_PRECISION_U64, PRICE_PRECISION, PRICE_PRECISION_I128,
+    PRICE_PRECISION_I64,
 };
 use crate::math::safe_math::SafeMath;
 use crate::state::perp_market::{ContractType, PerpMarket, AMM};

programs/drift/src/state/perp_market.rs

@@ -1,3 +1,4 @@
+use crate::msg;
 use crate::state::pyth_lazer_oracle::PythLazerOracle;
 use crate::state::user::MarketType;
 use anchor_lang::prelude::*;

sdk/VERSION

@@ -1 +1 @@
-2.143.0-beta.4
+2.143.0-beta.7

sdk/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.143.0-beta.4",
+	"version": "2.143.0-beta.7",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"module": "./lib/browser/index.js",

sdk/src/constants/spotMarkets.ts

@@ -459,14 +459,15 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'JLP',
 		marketIndex: 19,
 		poolId: 0,
-		oracle: new PublicKey('5Mb11e5rt1Sp6A286B145E4TmgMzsM2UX9nCF2vas5bs'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('4VMtKepA6iFwMTJ7bBbdcGxavNRKiDjxxRr1CaB2NnFJ'),
+		oracleSource: OracleSource.PYTH_LAZER,
 		mint: new PublicKey('27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
 		launchTs: 1719415157000,
 		pythFeedId:
 			'0xc811abc82b4bad1f9bd711a2773ccaa935b03ecef974236942cec5e0eb845a3a',
+		pythLazerId: 459,
 	},
 	{
 		symbol: 'POPCAT',

sdk/src/driftClient.ts

@@ -168,7 +168,11 @@ import { getMarinadeDepositIx, getMarinadeFinanceProgram } from './marinade';
 import { getOrderParams, isUpdateHighLeverageMode } from './orderParams';
 import { numberToSafeBN } from './math/utils';
 import { TransactionParamProcessor } from './tx/txParamProcessor';
-import { isOracleValid, trimVaaSignatures } from './math/oracles';
+import {
+	isOracleTooDivergent,
+	isOracleValid,
+	trimVaaSignatures,
+} from './math/oracles';
 import { TxHandler } from './tx/txHandler';
 import {
 	DEFAULT_RECEIVER_PROGRAM_ID,
@@ -9384,23 +9388,28 @@ export class DriftClient {
 			isExchangeOracleMoreRecent = false;
 		}
 
+		const conf = getOracleConfidenceFromMMOracleData(
+			perpMarket.amm.mmOraclePrice,
+			oracleData
+		);
+
 		if (
-			!isOracleValid(
-				perpMarket,
-				oracleData,
-				stateAccountAndSlot.data.oracleGuardRails,
-				stateAccountAndSlot.slot
+			isOracleTooDivergent(
+				perpMarket.amm,
+				{
+					price: perpMarket.amm.mmOraclePrice,
+					slot: perpMarket.amm.mmOracleSlot,
+					confidence: conf,
+					hasSufficientNumberOfDataPoints: true,
+				},
+				stateAccountAndSlot.data.oracleGuardRails
 			) ||
 			perpMarket.amm.mmOraclePrice.eq(ZERO) ||
 			isExchangeOracleMoreRecent ||
 			pctDiff.gt(PERCENTAGE_PRECISION.divn(100)) // 1% threshold
 		) {
 			return { ...oracleData, isMMOracleActive };
 		} else {
-			const conf = getOracleConfidenceFromMMOracleData(
-				perpMarket.amm.mmOraclePrice,
-				oracleData
-			);
 			return {
 				price: perpMarket.amm.mmOraclePrice,
 				slot: perpMarket.amm.mmOracleSlot,

sdk/src/math/oracles.ts

@@ -10,7 +10,6 @@ import { OraclePriceData } from '../oracles/types';
 import {
 	BID_ASK_SPREAD_PRECISION,
 	MARGIN_PRECISION,
-	PRICE_PRECISION,
 	ONE,
 	ZERO,
 	FIVE_MINUTE,
@@ -97,29 +96,17 @@ export function isOracleValid(
 export function isOracleTooDivergent(
 	amm: AMM,
 	oraclePriceData: OraclePriceData,
-	oracleGuardRails: OracleGuardRails,
-	now: BN
+	oracleGuardRails: OracleGuardRails
 ): boolean {
-	const sinceLastUpdate = now.sub(
-		amm.historicalOracleData.lastOraclePriceTwapTs
-	);
-	const sinceStart = BN.max(ZERO, FIVE_MINUTE.sub(sinceLastUpdate));
-	const oracleTwap5min = amm.historicalOracleData.lastOraclePriceTwap5Min
-		.mul(sinceStart)
-		.add(oraclePriceData.price)
-		.mul(sinceLastUpdate)
-		.div(sinceStart.add(sinceLastUpdate));
-
-	const oracleSpread = oracleTwap5min.sub(oraclePriceData.price);
-	const oracleSpreadPct = oracleSpread.mul(PRICE_PRECISION).div(oracleTwap5min);
-
+	const oracleSpreadPct = oraclePriceData.price
+		.sub(amm.historicalOracleData.lastOraclePriceTwap5Min)
+		.mul(PERCENTAGE_PRECISION)
+		.div(amm.historicalOracleData.lastOraclePriceTwap5Min);
 	const maxDivergence = BN.max(
-		oracleGuardRails.priceDivergence.markOraclePercentDivergence,
-		PERCENTAGE_PRECISION.div(new BN(10))
+		oracleGuardRails.priceDivergence.oracleTwap5MinPercentDivergence,
+		PERCENTAGE_PRECISION.div(new BN(2))
 	);
-
 	const tooDivergent = oracleSpreadPct.abs().gte(maxDivergence);
-
 	return tooDivergent;
 }