@drift-labs/sdk 2.143.0-beta.7 → 2.143.0-beta.9

package/VERSION

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

package/lib/browser/adminClient.d.ts

@@ -201,8 +201,8 @@ export declare class AdminClient extends DriftClient {
     getUpdateSpotMarketFuelIx(spotMarketIndex: number, fuelBoostDeposits?: number, fuelBoostBorrows?: number, fuelBoostTaker?: number, fuelBoostMaker?: number, fuelBoostInsurance?: number): Promise<TransactionInstruction>;
     updatePerpMarketFuel(perpMarketIndex: number, fuelBoostTaker?: number, fuelBoostMaker?: number, fuelBoostPosition?: number): Promise<TransactionSignature>;
     getUpdatePerpMarketFuelIx(perpMarketIndex: number, fuelBoostTaker?: number, fuelBoostMaker?: number, fuelBoostPosition?: number): Promise<TransactionInstruction>;
-    updatePerpMarketTakerSpeedBumpOverride(perpMarketIndex: number, takerSpeedBumpOverride: number): Promise<TransactionSignature>;
-    getUpdatePerpMarketTakerSpeedBumpOverrideIx(perpMarketIndex: number, takerSpeedBumpOverride: number): Promise<TransactionInstruction>;
+    updatePerpMarketOracleLowRiskSlotDelayOverride(perpMarketIndex: number, oracleLowRiskSlotDelayOverride: number): Promise<TransactionSignature>;
+    getUpdatePerpMarketOracleLowRiskSlotDelayOverrideIx(perpMarketIndex: number, oracleLowRiskSlotDelayOverride: number): Promise<TransactionInstruction>;
     updatePerpMarketOracleSlotDelayOverride(perpMarketIndex: number, oracleSlotDelay: number): Promise<TransactionSignature>;
     getUpdatePerpMarketOracleSlotDelayOverrideIx(perpMarketIndex: number, oracleSlotDelay: number): Promise<TransactionInstruction>;
     updatePerpMarketAmmSpreadAdjustment(perpMarketIndex: number, ammSpreadAdjustment: number, ammInventorySpreadAdjustment: number, referencePriceOffset: number): Promise<TransactionSignature>;

package/lib/browser/adminClient.js

@@ -1856,15 +1856,15 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
-    async updatePerpMarketTakerSpeedBumpOverride(perpMarketIndex, takerSpeedBumpOverride) {
-        const updatePerpMarketTakerSpeedBumpOverrideIx = await this.getUpdatePerpMarketTakerSpeedBumpOverrideIx(perpMarketIndex, takerSpeedBumpOverride);
-        const tx = await this.buildTransaction(updatePerpMarketTakerSpeedBumpOverrideIx);
+    async updatePerpMarketOracleLowRiskSlotDelayOverride(perpMarketIndex, oracleLowRiskSlotDelayOverride) {
+        const updatePerpMarketOracleLowRiskSlotDelayOverrideIx = await this.getUpdatePerpMarketOracleLowRiskSlotDelayOverrideIx(perpMarketIndex, oracleLowRiskSlotDelayOverride);
+        const tx = await this.buildTransaction(updatePerpMarketOracleLowRiskSlotDelayOverrideIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getUpdatePerpMarketTakerSpeedBumpOverrideIx(perpMarketIndex, takerSpeedBumpOverride) {
+    async getUpdatePerpMarketOracleLowRiskSlotDelayOverrideIx(perpMarketIndex, oracleLowRiskSlotDelayOverride) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        return await this.program.instruction.updatePerpMarketTakerSpeedBumpOverride(takerSpeedBumpOverride, {
+        return await this.program.instruction.updatePerpMarketOracleLowRiskSlotDelayOverride(oracleLowRiskSlotDelayOverride, {
             accounts: {
                 admin: this.useHotWalletAdmin
                     ? this.wallet.publicKey

package/lib/browser/dlob/DLOB.d.ts

@@ -95,10 +95,14 @@ export declare class DLOB {
     mergeNodesToFill(restingLimitOrderNodesToFill: NodeToFill[], takingOrderNodesToFill: NodeToFill[]): NodeToFill[];
     findRestingLimitOrderNodesToFill<T extends MarketType>(marketIndex: number, slot: number, marketType: T, oraclePriceData: T extends {
         spot: unknown;
-    } ? OraclePriceData : MMOraclePriceData, isAmmPaused: boolean, minAuctionDuration: number, makerRebateNumerator: number, makerRebateDenominator: number, fallbackAsk: BN | undefined, fallbackBid: BN | undefined): NodeToFill[];
+    } ? OraclePriceData : MMOraclePriceData, isAmmPaused: boolean, stateAccount: StateAccount, marketAccount: T extends {
+        spot: unknown;
+    } ? SpotMarketAccount : PerpMarketAccount, makerRebateNumerator: number, makerRebateDenominator: number, fallbackAsk: BN | undefined, fallbackBid: BN | undefined): NodeToFill[];
     findTakingNodesToFill<T extends MarketType>(marketIndex: number, slot: number, marketType: T, oraclePriceData: T extends {
         spot: unknown;
-    } ? OraclePriceData : MMOraclePriceData, isAmmPaused: boolean, minAuctionDuration: number, fallbackAsk: BN | undefined, fallbackBid?: BN | undefined): NodeToFill[];
+    } ? OraclePriceData : MMOraclePriceData, isAmmPaused: boolean, state: StateAccount, marketAccount: T extends {
+        spot: unknown;
+    } ? SpotMarketAccount : PerpMarketAccount, fallbackAsk: BN | undefined, fallbackBid?: BN | undefined): NodeToFill[];
     findTakingNodesCrossingMakerNodes<T extends MarketType>(marketIndex: number, slot: number, marketType: T, oraclePriceData: T extends {
         spot: unknown;
     } ? OraclePriceData : MMOraclePriceData, takerNodeGenerator: Generator<DLOBNode>, makerNodeGeneratorFn: (marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: T extends {
@@ -106,7 +110,9 @@ export declare class DLOB {
     } ? OraclePriceData : MMOraclePriceData) => Generator<DLOBNode>, doesCross: (takerPrice: BN | undefined, makerPrice: BN) => boolean): NodeToFill[];
     findNodesCrossingFallbackLiquidity<T extends MarketType>(marketType: T, slot: number, oraclePriceData: T extends {
         spot: unknown;
-    } ? OraclePriceData : MMOraclePriceData, nodeGenerator: Generator<DLOBNode>, doesCross: (nodePrice: BN | undefined) => boolean, minAuctionDuration: number): NodeToFill[];
+    } ? OraclePriceData : MMOraclePriceData, nodeGenerator: Generator<DLOBNode>, doesCross: (nodePrice: BN | undefined) => boolean, state: StateAccount, marketAccount: T extends {
+        spot: unknown;
+    } ? SpotMarketAccount : PerpMarketAccount): NodeToFill[];
     findExpiredNodesToFill(marketIndex: number, ts: number, marketType: MarketType, slot?: BN): NodeToFill[];
     findUnfillableReduceOnlyOrdersToCancel(marketIndex: number, marketType: MarketType, stepSize: BN): NodeToFill[];
     getTakingBids<T extends MarketType>(marketIndex: number, marketType: T, slot: number, oraclePriceData: T extends {

package/lib/browser/dlob/DLOB.js

@@ -250,12 +250,9 @@ class DLOB {
             return [];
         }
         const isAmmPaused = (0, exchangeStatus_1.ammPaused)(stateAccount, marketAccount);
-        const minAuctionDuration = (0, types_1.isVariant)(marketType, 'perp')
-            ? stateAccount.minPerpAuctionDuration
-            : 0;
         const { makerRebateNumerator, makerRebateDenominator } = this.getMakerRebate(marketType, stateAccount, marketAccount);
-        const takingOrderNodesToFill = this.findTakingNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, fallbackAsk, fallbackBid);
-        const restingLimitOrderNodesToFill = this.findRestingLimitOrderNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, makerRebateNumerator, makerRebateDenominator, fallbackAsk, fallbackBid);
+        const takingOrderNodesToFill = this.findTakingNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, stateAccount, marketAccount, fallbackAsk, fallbackBid);
+        const restingLimitOrderNodesToFill = this.findRestingLimitOrderNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, stateAccount, marketAccount, makerRebateNumerator, makerRebateDenominator, fallbackAsk, fallbackBid);
         // get expired market nodes
         const expiredNodesToFill = this.findExpiredNodesToFill(marketIndex, ts, marketType, new anchor_1.BN(slot));
         const stepSize = (0, types_1.isVariant)(marketType, 'perp')
@@ -310,7 +307,7 @@ class DLOB {
         mergeNodesToFillHelper(takingOrderNodesToFill);
         return Array.from(mergedNodesToFill.values());
     }
-    findRestingLimitOrderNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, makerRebateNumerator, makerRebateDenominator, fallbackAsk, fallbackBid) {
+    findRestingLimitOrderNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, stateAccount, marketAccount, makerRebateNumerator, makerRebateDenominator, fallbackAsk, fallbackBid) {
         const nodesToFill = new Array();
         const crossingNodes = this.findCrossingRestingLimitOrders(marketIndex, slot, marketType, oraclePriceData);
         for (const crossingNode of crossingNodes) {
@@ -321,7 +318,7 @@ class DLOB {
             const fallbackBidWithBuffer = fallbackBid.sub(fallbackBid.muln(makerRebateNumerator).divn(makerRebateDenominator));
             const asksCrossingFallback = this.findNodesCrossingFallbackLiquidity(marketType, slot, oraclePriceData, askGenerator, (askPrice) => {
                 return askPrice.lte(fallbackBidWithBuffer);
-            }, minAuctionDuration);
+            }, stateAccount, marketAccount);
             for (const askCrossingFallback of asksCrossingFallback) {
                 nodesToFill.push(askCrossingFallback);
             }
@@ -331,14 +328,14 @@ class DLOB {
             const fallbackAskWithBuffer = fallbackAsk.add(fallbackAsk.muln(makerRebateNumerator).divn(makerRebateDenominator));
             const bidsCrossingFallback = this.findNodesCrossingFallbackLiquidity(marketType, slot, oraclePriceData, bidGenerator, (bidPrice) => {
                 return bidPrice.gte(fallbackAskWithBuffer);
-            }, minAuctionDuration);
+            }, stateAccount, marketAccount);
             for (const bidCrossingFallback of bidsCrossingFallback) {
                 nodesToFill.push(bidCrossingFallback);
             }
         }
         return nodesToFill;
     }
-    findTakingNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, fallbackAsk, fallbackBid) {
+    findTakingNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, state, marketAccount, fallbackAsk, fallbackBid) {
         const nodesToFill = new Array();
         let takingOrderGenerator = this.getTakingAsks(marketIndex, marketType, slot, oraclePriceData);
         const takingAsksCrossingBids = this.findTakingNodesCrossingMakerNodes(marketIndex, slot, marketType, oraclePriceData, takingOrderGenerator, this.getRestingLimitBids.bind(this), (takerPrice, makerPrice) => {
@@ -359,7 +356,7 @@ class DLOB {
             takingOrderGenerator = this.getTakingAsks(marketIndex, marketType, slot, oraclePriceData);
             const takingAsksCrossingFallback = this.findNodesCrossingFallbackLiquidity(marketType, slot, oraclePriceData, takingOrderGenerator, (takerPrice) => {
                 return takerPrice === undefined || takerPrice.lte(fallbackBid);
-            }, minAuctionDuration);
+            }, state, marketAccount);
             for (const takingAskCrossingFallback of takingAsksCrossingFallback) {
                 nodesToFill.push(takingAskCrossingFallback);
             }
@@ -383,7 +380,7 @@ class DLOB {
             takingOrderGenerator = this.getTakingBids(marketIndex, marketType, slot, oraclePriceData);
             const takingBidsCrossingFallback = this.findNodesCrossingFallbackLiquidity(marketType, slot, oraclePriceData, takingOrderGenerator, (takerPrice) => {
                 return takerPrice === undefined || takerPrice.gte(fallbackAsk);
-            }, minAuctionDuration);
+            }, state, marketAccount);
             for (const marketBidCrossingFallback of takingBidsCrossingFallback) {
                 nodesToFill.push(marketBidCrossingFallback);
             }
@@ -441,7 +438,7 @@ class DLOB {
         }
         return nodesToFill;
     }
-    findNodesCrossingFallbackLiquidity(marketType, slot, oraclePriceData, nodeGenerator, doesCross, minAuctionDuration) {
+    findNodesCrossingFallbackLiquidity(marketType, slot, oraclePriceData, nodeGenerator, doesCross, state, marketAccount) {
         var _a;
         const nodesToFill = new Array();
         let nextNode = nodeGenerator.next();
@@ -456,7 +453,7 @@ class DLOB {
             const crosses = doesCross(nodePrice);
             // fallback is available if auction is complete or it's a spot order
             const fallbackAvailable = (0, types_1.isVariant)(marketType, 'spot') ||
-                (0, auction_1.isFallbackAvailableLiquiditySource)(node.order, minAuctionDuration, slot);
+                (0, auction_1.isFallbackAvailableLiquiditySource)(node.order, oraclePriceData, slot, state, marketAccount);
             if (crosses && fallbackAvailable) {
                 nodesToFill.push({
                     node: node,

package/lib/browser/idl/drift.json

@@ -6566,7 +6566,7 @@
             ]
         },
         {
-            "name": "updatePerpMarketTakerSpeedBumpOverride",
+            "name": "updatePerpMarketOracleLowRiskSlotDelayOverride",
             "accounts": [
                 {
                     "name": "admin",
@@ -6586,7 +6586,7 @@
             ],
             "args": [
                 {
-                    "name": "takerSpeedBumpOverride",
+                    "name": "oracleLowRiskSlotDelayOverride",
                     "type": "i8"
                 }
             ]
@@ -11194,7 +11194,7 @@
                         "type": "i8"
                     },
                     {
-                        "name": "takerSpeedBumpOverride",
+                        "name": "oracleLowRiskSlotDelayOverride",
                         "docs": [
                             "the override for the state.min_perp_auction_duration",
                             "0 is no override, -1 is disable speed bump, 1-100 is literal speed bump"
@@ -12278,7 +12278,17 @@
                         "name": "InsufficientDataPoints"
                     },
                     {
-                        "name": "StaleForAMM"
+                        "name": "StaleForAMM",
+                        "fields": [
+                            {
+                                "name": "immediate",
+                                "type": "bool"
+                            },
+                            {
+                                "name": "lowRisk",
+                                "type": "bool"
+                            }
+                        ]
                     },
                     {
                         "name": "Valid"
@@ -12304,7 +12314,10 @@
                         "name": "FillOrderMatch"
                     },
                     {
-                        "name": "FillOrderAmm"
+                        "name": "FillOrderAmmLowRisk"
+                    },
+                    {
+                        "name": "FillOrderAmmImmediate"
                     },
                     {
                         "name": "Liquidate"
@@ -12954,23 +12967,6 @@
                 ]
             }
         },
-        {
-            "name": "AMMAvailability",
-            "type": {
-                "kind": "enum",
-                "variants": [
-                    {
-                        "name": "Immediate"
-                    },
-                    {
-                        "name": "AfterMinDuration"
-                    },
-                    {
-                        "name": "Unavailable"
-                    }
-                ]
-            }
-        },
         {
             "name": "RevenueShareOrderBitFlag",
             "type": {

package/lib/browser/math/auction.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="bn.js" />
-import { Order, PositionDirection } from '../types';
+import { Order, PositionDirection, StateAccount } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { PerpMarketAccount } from '../types';
+import { MMOraclePriceData } from '../oracles/types';
 export declare function isAuctionComplete(order: Order, slot: number): boolean;
-export declare function isFallbackAvailableLiquiditySource(order: Order, minAuctionDuration: number, slot: number): boolean;
+export declare function isFallbackAvailableLiquiditySource(order: Order, mmOraclePriceData: MMOraclePriceData, slot: number, state: StateAccount, market: PerpMarketAccount, isLiquidation?: boolean): boolean;
 /**
  *
  * @param order

package/lib/browser/math/auction.js

@@ -6,6 +6,9 @@ const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_2 = require("../types");
 const tiers_1 = require("./tiers");
+const orders_1 = require("./orders");
+const oracles_1 = require("./oracles");
+const exchangeStatus_1 = require("./exchangeStatus");
 function isAuctionComplete(order, slot) {
     if (order.auctionDuration === 0) {
         return true;
@@ -13,14 +16,30 @@ function isAuctionComplete(order, slot) {
     return new anchor_1.BN(slot).sub(order.slot).gt(new anchor_1.BN(order.auctionDuration));
 }
 exports.isAuctionComplete = isAuctionComplete;
-function isFallbackAvailableLiquiditySource(order, minAuctionDuration, slot) {
-    if (minAuctionDuration === 0) {
+function isFallbackAvailableLiquiditySource(order, mmOraclePriceData, slot, state, market, isLiquidation) {
+    if ((0, exchangeStatus_1.isOperationPaused)(market.pausedOperations, types_1.PerpOperation.AMM_FILL)) {
+        return false;
+    }
+    // TODO: include too much drawdown check & mm oracle volatility
+    const oracleValidity = (0, oracles_1.getOracleValidity)(market, {
+        price: mmOraclePriceData.price,
+        slot: mmOraclePriceData.slot,
+        confidence: mmOraclePriceData.confidence,
+        hasSufficientNumberOfDataPoints: mmOraclePriceData.hasSufficientNumberOfDataPoints,
+    }, state.oracleGuardRails, new anchor_1.BN(slot));
+    if (oracleValidity <= types_1.OracleValidity.StaleForAMMLowRisk) {
+        return false;
+    }
+    if (oracleValidity == types_1.OracleValidity.Valid) {
         return true;
     }
-    if ((order.bitFlags & types_2.OrderBitFlag.SafeTriggerOrder) !== 0) {
+    const isOrderLowRiskForAmm = (0, orders_1.isLowRiskForAmm)(order, mmOraclePriceData, isLiquidation);
+    if (!isOrderLowRiskForAmm) {
+        return false;
+    }
+    else {
         return true;
     }
-    return new anchor_1.BN(slot).sub(order.slot).gt(new anchor_1.BN(minAuctionDuration));
 }
 exports.isFallbackAvailableLiquiditySource = isFallbackAvailableLiquiditySource;
 /**

package/lib/browser/math/margin.d.ts

@@ -5,7 +5,7 @@ import { DriftClient } from '../driftClient';
 import { PerpMarketAccount, PerpPosition, PositionDirection, UserAccount } from '../types';
 import { PublicKey } from '@solana/web3.js';
 export declare function calculateSizePremiumLiabilityWeight(size: BN, // AMM_RESERVE_PRECISION
-imfFactor: BN, liabilityWeight: BN, precision: BN): BN;
+imfFactor: BN, liabilityWeight: BN, precision: BN, isBounded?: boolean): BN;
 export declare function calculateSizeDiscountAssetWeight(size: BN, // AMM_RESERVE_PRECISION
 imfFactor: BN, assetWeight: BN): BN;
 export declare function calculateOraclePriceForPerpMargin(perpPosition: PerpPosition, market: PerpMarketAccount, oraclePriceData: OraclePriceData): BN;
@@ -43,3 +43,4 @@ export declare function calculateUserMaxPerpOrderSize(driftClient: DriftClient,
     tradeSize: BN;
     oppositeSideTradeSize: BN;
 };
+export declare function calcHighLeverageModeInitialMarginRatioFromSize(preSizeAdjMarginRatio: BN, sizeAdjMarginRatio: BN, defaultMarginRatio: BN): BN;

package/lib/browser/math/margin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateUserMaxPerpOrderSize = exports.calculateLiquidationPrice = exports.calculateCollateralValueOfDeposit = exports.calculateCollateralDepositRequiredForTrade = exports.calculateMarginUSDCRequiredForTrade = exports.calculatePerpLiabilityValue = exports.calculateWorstCasePerpLiabilityValue = exports.calculateWorstCaseBaseAssetAmount = exports.calculateBaseAssetValueWithOracle = exports.calculateOraclePriceForPerpMargin = exports.calculateSizeDiscountAssetWeight = exports.calculateSizePremiumLiabilityWeight = void 0;
+exports.calcHighLeverageModeInitialMarginRatioFromSize = exports.calculateUserMaxPerpOrderSize = exports.calculateLiquidationPrice = exports.calculateCollateralValueOfDeposit = exports.calculateCollateralDepositRequiredForTrade = exports.calculateMarginUSDCRequiredForTrade = exports.calculatePerpLiabilityValue = exports.calculateWorstCasePerpLiabilityValue = exports.calculateWorstCaseBaseAssetAmount = exports.calculateBaseAssetValueWithOracle = exports.calculateOraclePriceForPerpMargin = exports.calculateSizeDiscountAssetWeight = exports.calculateSizePremiumLiabilityWeight = void 0;
 const utils_1 = require("./utils");
 const numericConstants_1 = require("../constants/numericConstants");
 const anchor_1 = require("@coral-xyz/anchor");
@@ -11,7 +11,7 @@ const user_1 = require("../user");
 const types_1 = require("../types");
 const assert_1 = require("../assert/assert");
 function calculateSizePremiumLiabilityWeight(size, // AMM_RESERVE_PRECISION
-imfFactor, liabilityWeight, precision) {
+imfFactor, liabilityWeight, precision, isBounded = true) {
     if (imfFactor.eq(numericConstants_1.ZERO)) {
         return liabilityWeight;
     }
@@ -23,7 +23,13 @@ imfFactor, liabilityWeight, precision) {
         .mul(imfFactor)
         .div(denom) // 1e5
     );
-    const maxLiabilityWeight = anchor_1.BN.max(liabilityWeight, sizePremiumLiabilityWeight);
+    let maxLiabilityWeight;
+    if (isBounded) {
+        maxLiabilityWeight = anchor_1.BN.max(liabilityWeight, sizePremiumLiabilityWeight);
+    }
+    else {
+        maxLiabilityWeight = sizePremiumLiabilityWeight;
+    }
     return maxLiabilityWeight;
 }
 exports.calculateSizePremiumLiabilityWeight = calculateSizePremiumLiabilityWeight;
@@ -199,3 +205,25 @@ function calculateUserMaxPerpOrderSize(driftClient, userAccountKey, userAccount,
     return user.getMaxTradeSizeUSDCForPerp(targetMarketIndex, tradeSide);
 }
 exports.calculateUserMaxPerpOrderSize = calculateUserMaxPerpOrderSize;
+function calcHighLeverageModeInitialMarginRatioFromSize(preSizeAdjMarginRatio, sizeAdjMarginRatio, defaultMarginRatio) {
+    let result;
+    if (sizeAdjMarginRatio.lt(preSizeAdjMarginRatio)) {
+        const sizePctDiscountFactor = numericConstants_1.PERCENTAGE_PRECISION.sub(preSizeAdjMarginRatio
+            .sub(sizeAdjMarginRatio)
+            .mul(numericConstants_1.PERCENTAGE_PRECISION)
+            .div(preSizeAdjMarginRatio.div(new anchor_1.BN(5))));
+        const hlmMarginDelta = anchor_1.BN.max(preSizeAdjMarginRatio.sub(defaultMarginRatio), new anchor_1.BN(1));
+        const hlmMarginDeltaProportion = hlmMarginDelta
+            .mul(sizePctDiscountFactor)
+            .div(numericConstants_1.PERCENTAGE_PRECISION);
+        result = hlmMarginDeltaProportion.add(defaultMarginRatio);
+    }
+    else if (sizeAdjMarginRatio.eq(preSizeAdjMarginRatio)) {
+        result = defaultMarginRatio;
+    }
+    else {
+        result = sizeAdjMarginRatio;
+    }
+    return result;
+}
+exports.calcHighLeverageModeInitialMarginRatioFromSize = calcHighLeverageModeInitialMarginRatioFromSize;

package/lib/browser/math/market.js

@@ -61,29 +61,49 @@ function calculateOracleSpread(price, oraclePriceData) {
 }
 exports.calculateOracleSpread = calculateOracleSpread;
 function calculateMarketMarginRatio(market, size, marginCategory, customMarginRatio = 0, userHighLeverageMode = false) {
-    let marginRationInitial;
-    let marginRatioMaintenance;
-    if (userHighLeverageMode &&
+    if (market.status === 'Settlement')
+        return 0;
+    const isHighLeverageUser = userHighLeverageMode &&
         market.highLeverageMarginRatioInitial > 0 &&
-        market.highLeverageMarginRatioMaintenance) {
-        marginRationInitial = market.highLeverageMarginRatioInitial;
-        marginRatioMaintenance = market.highLeverageMarginRatioMaintenance;
-    }
-    else {
-        marginRationInitial = market.marginRatioInitial;
-        marginRatioMaintenance = market.marginRatioMaintenance;
-    }
-    let marginRatio;
+        market.highLeverageMarginRatioMaintenance > 0;
+    const marginRatioInitial = isHighLeverageUser
+        ? market.highLeverageMarginRatioInitial
+        : market.marginRatioInitial;
+    const marginRatioMaintenance = isHighLeverageUser
+        ? market.highLeverageMarginRatioMaintenance
+        : market.marginRatioMaintenance;
+    let defaultMarginRatio;
     switch (marginCategory) {
-        case 'Initial': {
-            // use lowest leverage between max allowed and optional user custom max
-            marginRatio = Math.max((0, margin_1.calculateSizePremiumLiabilityWeight)(size, new anchor_1.BN(market.imfFactor), new anchor_1.BN(marginRationInitial), numericConstants_1.MARGIN_PRECISION).toNumber(), customMarginRatio);
+        case 'Initial':
+            defaultMarginRatio = marginRatioInitial;
             break;
-        }
-        case 'Maintenance': {
-            marginRatio = (0, margin_1.calculateSizePremiumLiabilityWeight)(size, new anchor_1.BN(market.imfFactor), new anchor_1.BN(marginRatioMaintenance), numericConstants_1.MARGIN_PRECISION).toNumber();
+        case 'Maintenance':
+            defaultMarginRatio = marginRatioMaintenance;
             break;
+        default:
+            throw new Error('Invalid margin category');
+    }
+    let marginRatio;
+    if (isHighLeverageUser && marginCategory !== 'Maintenance') {
+        // Use ordinary-mode initial/fill ratios for size-adjusted calc
+        let preSizeAdjMarginRatio;
+        switch (marginCategory) {
+            case 'Initial':
+                preSizeAdjMarginRatio = market.marginRatioInitial;
+                break;
+            default:
+                preSizeAdjMarginRatio = marginRatioMaintenance;
+                break;
         }
+        const sizeAdjMarginRatio = (0, margin_1.calculateSizePremiumLiabilityWeight)(size, new anchor_1.BN(market.imfFactor), new anchor_1.BN(preSizeAdjMarginRatio), numericConstants_1.MARGIN_PRECISION, false).toNumber();
+        marginRatio = (0, margin_1.calcHighLeverageModeInitialMarginRatioFromSize)(new anchor_1.BN(preSizeAdjMarginRatio), new anchor_1.BN(sizeAdjMarginRatio), new anchor_1.BN(defaultMarginRatio)).toNumber();
+    }
+    else {
+        const sizeAdjMarginRatio = (0, margin_1.calculateSizePremiumLiabilityWeight)(size, new anchor_1.BN(market.imfFactor), new anchor_1.BN(defaultMarginRatio), numericConstants_1.MARGIN_PRECISION, true).toNumber();
+        marginRatio = Math.max(defaultMarginRatio, sizeAdjMarginRatio);
+    }
+    if (marginCategory === 'Initial') {
+        marginRatio = Math.max(marginRatio, customMarginRatio);
     }
     return marginRatio;
 }

package/lib/browser/math/oracles.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="bn.js" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { AMM, HistoricalOracleData, OracleGuardRails, OracleSource, PerpMarketAccount } from '../types';
+import { AMM, HistoricalOracleData, OracleGuardRails, OracleSource, OracleValidity, PerpMarketAccount } from '../types';
 import { OraclePriceData } from '../oracles/types';
 import { BN } from '@coral-xyz/anchor';
 export declare function oraclePriceBands(market: PerpMarketAccount, oraclePriceData: Pick<OraclePriceData, 'price'>): [BN, BN];
 export declare function getMaxConfidenceIntervalMultiplier(market: PerpMarketAccount): BN;
+export declare function getOracleValidity(market: PerpMarketAccount, oraclePriceData: OraclePriceData, oracleGuardRails: OracleGuardRails, slot: BN, oracleStalenessBuffer?: BN): OracleValidity;
 export declare function isOracleValid(market: PerpMarketAccount, oraclePriceData: OraclePriceData, oracleGuardRails: OracleGuardRails, slot: number): boolean;
 export declare function isOracleTooDivergent(amm: AMM, oraclePriceData: OraclePriceData, oracleGuardRails: OracleGuardRails): boolean;
 export declare function calculateLiveOracleTwap(histOracleData: HistoricalOracleData, oraclePriceData: OraclePriceData, now: BN, period: BN): BN;

package/lib/browser/math/oracles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMultipleBetweenOracleSources = exports.trimVaaSignatures = exports.getNewOracleConfPct = exports.calculateLiveOracleStd = exports.calculateLiveOracleTwap = exports.isOracleTooDivergent = exports.isOracleValid = exports.getMaxConfidenceIntervalMultiplier = exports.oraclePriceBands = void 0;
+exports.getMultipleBetweenOracleSources = exports.trimVaaSignatures = exports.getNewOracleConfPct = exports.calculateLiveOracleStd = exports.calculateLiveOracleTwap = exports.isOracleTooDivergent = exports.isOracleValid = exports.getOracleValidity = exports.getMaxConfidenceIntervalMultiplier = exports.oraclePriceBands = void 0;
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const assert_1 = require("../assert/assert");
@@ -34,6 +34,60 @@ function getMaxConfidenceIntervalMultiplier(market) {
     return maxConfidenceIntervalMultiplier;
 }
 exports.getMaxConfidenceIntervalMultiplier = getMaxConfidenceIntervalMultiplier;
+function getOracleValidity(market, oraclePriceData, oracleGuardRails, slot, oracleStalenessBuffer = numericConstants_1.FIVE) {
+    const isNonPositive = oraclePriceData.price.lte(numericConstants_1.ZERO);
+    const isTooVolatile = anchor_1.BN.max(oraclePriceData.price, market.amm.historicalOracleData.lastOraclePriceTwap)
+        .div(anchor_1.BN.max(numericConstants_1.ONE, anchor_1.BN.min(oraclePriceData.price, market.amm.historicalOracleData.lastOraclePriceTwap)))
+        .gt(oracleGuardRails.validity.tooVolatileRatio);
+    const confPctOfPrice = oraclePriceData.confidence
+        .mul(numericConstants_1.BID_ASK_SPREAD_PRECISION)
+        .div(oraclePriceData.price);
+    const isConfTooLarge = confPctOfPrice.gt(oracleGuardRails.validity.confidenceIntervalMaxSize.mul(getMaxConfidenceIntervalMultiplier(market)));
+    const oracleDelay = slot.sub(oraclePriceData.slot).sub(oracleStalenessBuffer);
+    let isStaleForAmmImmediate = true;
+    if (market.amm.oracleSlotDelayOverride != 0) {
+        isStaleForAmmImmediate = oracleDelay.gt(anchor_1.BN.max(new anchor_1.BN(market.amm.oracleSlotDelayOverride), numericConstants_1.ZERO));
+    }
+    let isStaleForAmmLowRisk = false;
+    if (market.amm.oracleLowRiskSlotDelayOverride != 0) {
+        isStaleForAmmLowRisk = oracleDelay.gt(anchor_1.BN.max(new anchor_1.BN(market.amm.oracleLowRiskSlotDelayOverride), numericConstants_1.ZERO));
+    }
+    else {
+        isStaleForAmmLowRisk = oracleDelay.gt(oracleGuardRails.validity.slotsBeforeStaleForAmm);
+    }
+    let isStaleForMargin = oracleDelay.gt(new anchor_1.BN(oracleGuardRails.validity.slotsBeforeStaleForMargin));
+    if ((0, types_1.isOneOfVariant)(market.amm.oracleSource, [
+        'pythStableCoinPull',
+        'pythLazerStableCoin',
+    ])) {
+        isStaleForMargin = oracleDelay.gt(new anchor_1.BN(oracleGuardRails.validity.slotsBeforeStaleForMargin).muln(3));
+    }
+    if (isNonPositive) {
+        return types_1.OracleValidity.NonPositive;
+    }
+    else if (isTooVolatile) {
+        return types_1.OracleValidity.TooVolatile;
+    }
+    else if (isConfTooLarge) {
+        return types_1.OracleValidity.TooUncertain;
+    }
+    else if (isStaleForMargin) {
+        return types_1.OracleValidity.StaleForMargin;
+    }
+    else if (!oraclePriceData.hasSufficientNumberOfDataPoints) {
+        return types_1.OracleValidity.InsufficientDataPoints;
+    }
+    else if (isStaleForAmmLowRisk) {
+        return types_1.OracleValidity.StaleForAMMLowRisk;
+    }
+    else if (isStaleForAmmImmediate) {
+        return types_1.OracleValidity.isStaleForAmmImmediate;
+    }
+    else {
+        return types_1.OracleValidity.Valid;
+    }
+}
+exports.getOracleValidity = getOracleValidity;
 function isOracleValid(market, oraclePriceData, oracleGuardRails, slot) {
     // checks if oracle is valid for an AMM only fill
     const amm = market.amm;

package/lib/browser/math/orders.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { User } from '../user';
-import { PerpMarketAccount, AMM, Order, PositionDirection, ProtectedMakerParams, MarketTypeStr } from '../types';
+import { PerpMarketAccount, AMM, Order, PositionDirection, ProtectedMakerParams, MarketTypeStr, StateAccount } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { MMOraclePriceData, OraclePriceData } from '../oracles/types';
 export declare function isOrderRiskIncreasing(user: User, order: Order): boolean;
@@ -12,7 +12,8 @@ export declare function getLimitPrice<T extends MarketTypeStr>(order: Order, ora
 export declare function applyProtectedMakerParams(limitPrice: BN, direction: PositionDirection, protectedMakerParams: ProtectedMakerParams): BN;
 export declare function hasLimitPrice(order: Order, slot: number): boolean;
 export declare function hasAuctionPrice(order: Order, slot: number): boolean;
-export declare function isFillableByVAMM(order: Order, market: PerpMarketAccount, mmOraclePriceData: MMOraclePriceData, slot: number, ts: number, minAuctionDuration: number): boolean;
+export declare function isFillableByVAMM(order: Order, market: PerpMarketAccount, mmOraclePriceData: MMOraclePriceData, slot: number, ts: number, state: StateAccount): boolean;
+export declare function isLowRiskForAmm(order: Order, mmOraclePriceData: MMOraclePriceData, isLiquidation?: boolean): boolean;
 export declare function calculateBaseAssetAmountForAmmToFulfill(order: Order, market: PerpMarketAccount, mmOraclePriceData: MMOraclePriceData, slot: number): BN;
 export declare function calculateBaseAssetAmountToFillUpToLimitPrice(order: Order, amm: AMM, limitPrice: BN, mmOraclePriceData: MMOraclePriceData): BN;
 export declare function isOrderExpired(order: Order, ts: number, enforceBuffer?: boolean, bufferSeconds?: number): boolean;

package/lib/browser/math/orders.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maxSizeForTargetLiabilityWeightBN = exports.calculateOrderBaseAssetAmount = exports.hasBuilder = exports.isSignedMsgOrder = exports.isTakingOrder = exports.isRestingLimitOrder = exports.isTriggered = exports.mustBeTriggered = exports.isLimitOrder = exports.isMarketOrder = exports.isOrderExpired = exports.calculateBaseAssetAmountToFillUpToLimitPrice = exports.calculateBaseAssetAmountForAmmToFulfill = exports.isFillableByVAMM = exports.hasAuctionPrice = exports.hasLimitPrice = exports.applyProtectedMakerParams = exports.getLimitPrice = exports.standardizePrice = exports.standardizeBaseAssetAmount = exports.isOrderReduceOnly = exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
+exports.maxSizeForTargetLiabilityWeightBN = exports.calculateOrderBaseAssetAmount = exports.hasBuilder = exports.isSignedMsgOrder = exports.isTakingOrder = exports.isRestingLimitOrder = exports.isTriggered = exports.mustBeTriggered = exports.isLimitOrder = exports.isMarketOrder = exports.isOrderExpired = exports.calculateBaseAssetAmountToFillUpToLimitPrice = exports.calculateBaseAssetAmountForAmmToFulfill = exports.isLowRiskForAmm = exports.isFillableByVAMM = exports.hasAuctionPrice = exports.hasLimitPrice = exports.applyProtectedMakerParams = exports.getLimitPrice = exports.standardizePrice = exports.standardizeBaseAssetAmount = exports.isOrderReduceOnly = exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const anchor_1 = require("@coral-xyz/anchor");
@@ -146,12 +146,22 @@ function hasAuctionPrice(order, slot) {
         (!order.auctionStartPrice.eq(numericConstants_1.ZERO) || !order.auctionEndPrice.eq(numericConstants_1.ZERO)));
 }
 exports.hasAuctionPrice = hasAuctionPrice;
-function isFillableByVAMM(order, market, mmOraclePriceData, slot, ts, minAuctionDuration) {
-    return (((0, auction_1.isFallbackAvailableLiquiditySource)(order, minAuctionDuration, slot) &&
+function isFillableByVAMM(order, market, mmOraclePriceData, slot, ts, state) {
+    return (((0, auction_1.isFallbackAvailableLiquiditySource)(order, mmOraclePriceData, slot, state, market) &&
         calculateBaseAssetAmountForAmmToFulfill(order, market, mmOraclePriceData, slot).gt(numericConstants_1.ZERO)) ||
         isOrderExpired(order, ts));
 }
 exports.isFillableByVAMM = isFillableByVAMM;
+function isLowRiskForAmm(order, mmOraclePriceData, isLiquidation) {
+    if ((0, types_1.isVariant)(order.marketType, 'spot')) {
+        return false;
+    }
+    const orderOlderThanOracleDelay = new anchor_1.BN(order.slot).lte(mmOraclePriceData.slot);
+    return (orderOlderThanOracleDelay ||
+        isLiquidation ||
+        (order.bitFlags & types_1.OrderBitFlag.SafeTriggerOrder) !== 0);
+}
+exports.isLowRiskForAmm = isLowRiskForAmm;
 function calculateBaseAssetAmountForAmmToFulfill(order, market, mmOraclePriceData, slot) {
     if (mustBeTriggered(order) && !isTriggered(order)) {
         return numericConstants_1.ZERO;

package/lib/browser/types.d.ts

@@ -1165,7 +1165,8 @@ export type AMM = {
     netUnsettledFundingPnl: BN;
     quoteAssetAmountWithUnsettledLp: BN;
     referencePriceOffset: number;
-    takerSpeedBumpOverride: number;
+    oracleLowRiskSlotDelayOverride: number;
+    oracleSlotDelayOverride: number;
     ammSpreadAdjustment: number;
     ammInventorySpreadAdjustment: number;
     lastFundingOracleTwap: BN;
@@ -1480,6 +1481,16 @@ export type OracleGuardRails = {
         tooVolatileRatio: BN;
     };
 };
+export declare enum OracleValidity {
+    NonPositive = 0,
+    TooVolatile = 1,
+    TooUncertain = 2,
+    StaleForMargin = 3,
+    InsufficientDataPoints = 4,
+    StaleForAMMLowRisk = 5,
+    isStaleForAmmImmediate = 6,
+    Valid = 7
+}
 export type PrelaunchOracle = {
     price: BN;
     maxPrice: BN;

package/lib/browser/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwapReduceOnly = exports.PlaceAndTakeOrderSuccessCondition = exports.FuelOverflowStatus = exports.ReferrerStatus = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.OrderParamsBitFlag = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderBitFlag = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSourceNum = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.TokenProgramFlag = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.MarginMode = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.FeatureBitFlags = exports.ExchangeStatus = void 0;
+exports.OracleValidity = exports.SwapReduceOnly = exports.PlaceAndTakeOrderSuccessCondition = exports.FuelOverflowStatus = exports.ReferrerStatus = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.OrderParamsBitFlag = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderBitFlag = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSourceNum = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.TokenProgramFlag = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.MarginMode = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.FeatureBitFlags = exports.ExchangeStatus = void 0;
 const numericConstants_1 = require("./constants/numericConstants");
 // # Utility Types / Enums / Constants
 var ExchangeStatus;
@@ -407,3 +407,14 @@ class SwapReduceOnly {
 exports.SwapReduceOnly = SwapReduceOnly;
 SwapReduceOnly.In = { in: {} };
 SwapReduceOnly.Out = { out: {} };
+var OracleValidity;
+(function (OracleValidity) {
+    OracleValidity[OracleValidity["NonPositive"] = 0] = "NonPositive";
+    OracleValidity[OracleValidity["TooVolatile"] = 1] = "TooVolatile";
+    OracleValidity[OracleValidity["TooUncertain"] = 2] = "TooUncertain";
+    OracleValidity[OracleValidity["StaleForMargin"] = 3] = "StaleForMargin";
+    OracleValidity[OracleValidity["InsufficientDataPoints"] = 4] = "InsufficientDataPoints";
+    OracleValidity[OracleValidity["StaleForAMMLowRisk"] = 5] = "StaleForAMMLowRisk";
+    OracleValidity[OracleValidity["isStaleForAmmImmediate"] = 6] = "isStaleForAmmImmediate";
+    OracleValidity[OracleValidity["Valid"] = 7] = "Valid";
+})(OracleValidity || (exports.OracleValidity = OracleValidity = {}));