@drift-labs/sdk 2.71.0-beta.4 → 2.72.0-beta.0

package/VERSION

@@ -1 +1 @@
-2.71.0-beta.4
+2.72.0-beta.0

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.70.0",
+    "version": "2.71.0",
     "name": "drift",
     "instructions": [
         {

package/lib/math/oracles.d.ts

@@ -3,7 +3,8 @@ import { AMM, OracleGuardRails } from '../types';
 import { OraclePriceData } from '../oracles/types';
 import { BN, HistoricalOracleData, PerpMarketAccount } from '../index';
 export declare function oraclePriceBands(market: PerpMarketAccount, oraclePriceData: OraclePriceData): [BN, BN];
-export declare function isOracleValid(amm: AMM, oraclePriceData: OraclePriceData, oracleGuardRails: OracleGuardRails, slot: number): boolean;
+export declare function getMaxConfidenceIntervalMultiplier(market: PerpMarketAccount): BN;
+export declare function isOracleValid(market: PerpMarketAccount, oraclePriceData: OraclePriceData, oracleGuardRails: OracleGuardRails, slot: number): boolean;
 export declare function isOracleTooDivergent(amm: AMM, oraclePriceData: OraclePriceData, oracleGuardRails: OracleGuardRails, now: BN): boolean;
 export declare function calculateLiveOracleTwap(histOracleData: HistoricalOracleData, oraclePriceData: OraclePriceData, now: BN, period: BN): BN;
 export declare function calculateLiveOracleStd(amm: AMM, oraclePriceData: OraclePriceData, now: BN): BN;

package/lib/math/oracles.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNewOracleConfPct = exports.calculateLiveOracleStd = exports.calculateLiveOracleTwap = exports.isOracleTooDivergent = exports.isOracleValid = exports.oraclePriceBands = void 0;
+exports.getNewOracleConfPct = exports.calculateLiveOracleStd = exports.calculateLiveOracleTwap = exports.isOracleTooDivergent = exports.isOracleValid = exports.getMaxConfidenceIntervalMultiplier = exports.oraclePriceBands = void 0;
+const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const index_1 = require("../index");
 const assert_1 = require("../assert/assert");
@@ -13,7 +14,29 @@ function oraclePriceBands(market, oraclePriceData) {
     return [oraclePriceData.price.sub(offset), oraclePriceData.price.add(offset)];
 }
 exports.oraclePriceBands = oraclePriceBands;
-function isOracleValid(amm, oraclePriceData, oracleGuardRails, slot) {
+function getMaxConfidenceIntervalMultiplier(market) {
+    let maxConfidenceIntervalMultiplier;
+    if ((0, types_1.isVariant)(market.contractTier, 'a')) {
+        maxConfidenceIntervalMultiplier = new index_1.BN(1);
+    }
+    else if ((0, types_1.isVariant)(market.contractTier, 'b')) {
+        maxConfidenceIntervalMultiplier = new index_1.BN(1);
+    }
+    else if ((0, types_1.isVariant)(market.contractTier, 'c')) {
+        maxConfidenceIntervalMultiplier = new index_1.BN(2);
+    }
+    else if ((0, types_1.isVariant)(market.contractTier, 'speculative')) {
+        maxConfidenceIntervalMultiplier = new index_1.BN(10);
+    }
+    else if ((0, types_1.isVariant)(market.contractTier, 'isolated')) {
+        maxConfidenceIntervalMultiplier = new index_1.BN(50);
+    }
+    return maxConfidenceIntervalMultiplier;
+}
+exports.getMaxConfidenceIntervalMultiplier = getMaxConfidenceIntervalMultiplier;
+function isOracleValid(market, oraclePriceData, oracleGuardRails, slot) {
+    // checks if oracle is valid for an AMM only fill
+    const amm = market.amm;
     const isOraclePriceNonPositive = oraclePriceData.price.lte(numericConstants_1.ZERO);
     const isOraclePriceTooVolatile = oraclePriceData.price
         .div(index_1.BN.max(numericConstants_1.ONE, amm.historicalOracleData.lastOraclePriceTwap))
@@ -21,10 +44,11 @@ function isOracleValid(amm, oraclePriceData, oracleGuardRails, slot) {
         amm.historicalOracleData.lastOraclePriceTwap
             .div(index_1.BN.max(numericConstants_1.ONE, oraclePriceData.price))
             .gt(oracleGuardRails.validity.tooVolatileRatio);
+    const maxConfidenceIntervalMultiplier = getMaxConfidenceIntervalMultiplier(market);
     const isConfidenceTooLarge = index_1.BN.max(numericConstants_1.ONE, oraclePriceData.confidence)
         .mul(numericConstants_1.BID_ASK_SPREAD_PRECISION)
         .div(oraclePriceData.price)
-        .gt(oracleGuardRails.validity.confidenceIntervalMaxSize);
+        .gt(oracleGuardRails.validity.confidenceIntervalMaxSize.mul(maxConfidenceIntervalMultiplier));
     const oracleIsStale = new index_1.BN(slot)
         .sub(oraclePriceData.slot)
         .gt(oracleGuardRails.validity.slotsBeforeStaleForAmm);

package/package.json

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

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.70.0",
+  "version": "2.71.0",
   "name": "drift",
   "instructions": [
     {

package/src/math/oracles.ts

@@ -1,4 +1,4 @@
-import { AMM, OracleGuardRails } from '../types';
+import { AMM, OracleGuardRails, isVariant } from '../types';
 import { OraclePriceData } from '../oracles/types';
 import {
 	BID_ASK_SPREAD_PRECISION,
@@ -27,12 +27,33 @@ export function oraclePriceBands(
 	return [oraclePriceData.price.sub(offset), oraclePriceData.price.add(offset)];
 }
 
+export function getMaxConfidenceIntervalMultiplier(
+	market: PerpMarketAccount
+): BN {
+	let maxConfidenceIntervalMultiplier;
+	if (isVariant(market.contractTier, 'a')) {
+		maxConfidenceIntervalMultiplier = new BN(1);
+	} else if (isVariant(market.contractTier, 'b')) {
+		maxConfidenceIntervalMultiplier = new BN(1);
+	} else if (isVariant(market.contractTier, 'c')) {
+		maxConfidenceIntervalMultiplier = new BN(2);
+	} else if (isVariant(market.contractTier, 'speculative')) {
+		maxConfidenceIntervalMultiplier = new BN(10);
+	} else if (isVariant(market.contractTier, 'isolated')) {
+		maxConfidenceIntervalMultiplier = new BN(50);
+	}
+	return maxConfidenceIntervalMultiplier;
+}
+
 export function isOracleValid(
-	amm: AMM,
+	market: PerpMarketAccount,
 	oraclePriceData: OraclePriceData,
 	oracleGuardRails: OracleGuardRails,
 	slot: number
 ): boolean {
+	// checks if oracle is valid for an AMM only fill
+
+	const amm = market.amm;
 	const isOraclePriceNonPositive = oraclePriceData.price.lte(ZERO);
 	const isOraclePriceTooVolatile =
 		oraclePriceData.price
@@ -42,10 +63,16 @@ export function isOracleValid(
 			.div(BN.max(ONE, oraclePriceData.price))
 			.gt(oracleGuardRails.validity.tooVolatileRatio);
 
+	const maxConfidenceIntervalMultiplier =
+		getMaxConfidenceIntervalMultiplier(market);
 	const isConfidenceTooLarge = BN.max(ONE, oraclePriceData.confidence)
 		.mul(BID_ASK_SPREAD_PRECISION)
 		.div(oraclePriceData.price)
-		.gt(oracleGuardRails.validity.confidenceIntervalMaxSize);
+		.gt(
+			oracleGuardRails.validity.confidenceIntervalMaxSize.mul(
+				maxConfidenceIntervalMultiplier
+			)
+		);
 
 	const oracleIsStale = new BN(slot)
 		.sub(oraclePriceData.slot)

package/tests/amm/test.ts

@@ -1193,12 +1193,12 @@ describe('AMM Tests', () => {
 		};
 
 		// good oracle
-		assert(isOracleValid(mockAmm, oraclePriceData, oracleGuardRails, slot + 5));
+		assert(isOracleValid(mockMarket1, oraclePriceData, oracleGuardRails, slot + 5));
 
 		// conf too high
 		assert(
 			!isOracleValid(
-				mockAmm,
+				mockMarket1,
 				{
 					price: new BN(13.553 * PRICE_PRECISION.toNumber()),
 					slot: new BN(slot),
@@ -1213,7 +1213,7 @@ describe('AMM Tests', () => {
 		// not hasSufficientNumberOfDataPoints
 		assert(
 			!isOracleValid(
-				mockAmm,
+				mockMarket1,
 				{
 					price: new BN(13.553 * PRICE_PRECISION.toNumber()),
 					slot: new BN(slot),
@@ -1228,7 +1228,7 @@ describe('AMM Tests', () => {
 		// negative oracle price
 		assert(
 			!isOracleValid(
-				mockAmm,
+				mockMarket1,
 				{
 					price: new BN(-1 * PRICE_PRECISION.toNumber()),
 					slot: new BN(slot),
@@ -1243,7 +1243,7 @@ describe('AMM Tests', () => {
 		// too delayed for amm
 		assert(
 			!isOracleValid(
-				mockAmm,
+				mockMarket1,
 				{
 					price: new BN(13.553 * PRICE_PRECISION.toNumber()),
 					slot: new BN(slot),
@@ -1258,7 +1258,7 @@ describe('AMM Tests', () => {
 		// im passing stale slot (should not call oracle invalid)
 		assert(
 			isOracleValid(
-				mockAmm,
+				mockMarket1,
 				{
 					price: new BN(13.553 * PRICE_PRECISION.toNumber()),
 					slot: new BN(slot + 100),
@@ -1273,7 +1273,7 @@ describe('AMM Tests', () => {
 		// too volatile (more than 5x higher)
 		assert(
 			!isOracleValid(
-				mockAmm,
+				mockMarket1,
 				{
 					price: new BN(113.553 * PRICE_PRECISION.toNumber()),
 					slot: new BN(slot + 5),
@@ -1288,7 +1288,7 @@ describe('AMM Tests', () => {
 		// too volatile (more than 1/5 lower)
 		assert(
 			!isOracleValid(
-				mockAmm,
+				mockMarket1,
 				{
 					price: new BN(0.553 * PRICE_PRECISION.toNumber()),
 					slot: new BN(slot + 5),