@drift-labs/sdk 2.130.0-beta.9 → 2.130.0

package/lib/browser/dlob/orderBookLevels.js

@@ -19,16 +19,19 @@ exports.MAJORS_TOP_OF_BOOK_QUOTE_AMOUNTS = [
     new anchor_1.BN(20000).mul(numericConstants_1.QUOTE_PRECISION),
     new anchor_1.BN(50000).mul(numericConstants_1.QUOTE_PRECISION),
 ];
+const INDICATIVE_QUOTES_PUBKEY = 'inDNdu3ML4vG5LNExqcwuCQtLcCU8KfK5YM2qYV3JJz';
 /**
  * Get an {@link Generator<L2Level>} generator from a {@link Generator<DLOBNode>}
  * @param dlobNodes e.g. {@link DLOB#getRestingLimitAsks} or {@link DLOB#getRestingLimitBids}
  * @param oraclePriceData
  * @param slot
  */
-const INDICATIVE_QUOTES_PUBKEY = 'inDNdu3ML4vG5LNExqcwuCQtLcCU8KfK5YM2qYV3JJz';
 function* getL2GeneratorFromDLOBNodes(dlobNodes, oraclePriceData, slot) {
     for (const dlobNode of dlobNodes) {
-        const size = dlobNode.order.baseAssetAmount.sub(dlobNode.order.baseAssetAmountFilled);
+        const size = dlobNode.baseAssetAmount.sub(dlobNode.order.baseAssetAmountFilled);
+        if (size.lte(numericConstants_1.ZERO)) {
+            continue;
+        }
         yield {
             size,
             price: dlobNode.getPrice(oraclePriceData, slot),

package/lib/browser/driftClient.d.ts

@@ -16,7 +16,7 @@ import { OraclePriceData } from './oracles/types';
 import { DriftClientConfig } from './driftClientConfig';
 import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
-import { DriftEnv } from './config/types';
+import { DriftEnv } from './config';
 import { UserStats } from './userStats';
 import { JupiterClient, QuoteResponse, SwapMode } from './jupiter/jupiterClient';
 import { UserStatsSubscriptionConfig } from './userStatsConfig';

package/lib/browser/driftClient.js

@@ -41,8 +41,8 @@ const numericConstants_1 = require("./constants/numericConstants");
 const position_1 = require("./math/position");
 const spotBalance_1 = require("./math/spotBalance");
 const userName_1 = require("./userName");
-const pollingDriftClientAccountSubscriber_1 = require("./accounts/driftClientAccount/pollingDriftClientAccountSubscriber");
-const webSocketDriftClientAccountSubscriber_1 = require("./accounts/driftClientAccount/webSocketDriftClientAccountSubscriber");
+const pollingDriftClientAccountSubscriber_1 = require("./accounts/pollingDriftClientAccountSubscriber");
+const webSocketDriftClientAccountSubscriber_1 = require("./accounts/webSocketDriftClientAccountSubscriber");
 const retryTxSender_1 = require("./tx/retryTxSender");
 const user_1 = require("./user");
 const config_1 = require("./config");
@@ -67,7 +67,7 @@ const ed25519Utils_1 = require("./util/ed25519Utils");
 const utils_2 = require("./tx/utils");
 const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_receiver.json"));
 const on_demand_1 = require("@switchboard-xyz/on-demand");
-const grpcDriftClientAccountSubscriber_1 = require("./accounts/driftClientAccount/grpcDriftClientAccountSubscriber");
+const grpcDriftClientAccountSubscriber_1 = require("./accounts/grpcDriftClientAccountSubscriber");
 const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const oracleId_1 = require("./oracles/oracleId");
 const sha256_1 = require("@noble/hashes/sha256");
@@ -4417,15 +4417,27 @@ class DriftClient {
         this.eventEmitter.emit(eventName, data);
     }
     getOracleDataForPerpMarket(marketIndex) {
-        return this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(marketIndex).data;
+        const perpMarket = this.getPerpMarketAccount(marketIndex);
+        const isMMOracleActive = !perpMarket.amm.mmOracleSlot.eq(numericConstants_1.ZERO);
+        return {
+            ...this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(marketIndex).data,
+            isMMOracleActive,
+        };
     }
     getMMOracleDataForPerpMarket(marketIndex) {
         const perpMarket = this.getPerpMarketAccount(marketIndex);
         const oracleData = this.getOracleDataForPerpMarket(marketIndex);
         const stateAccountAndSlot = this.accountSubscriber.getStateAccountAndSlot();
+        const pctDiff = perpMarket.amm.mmOraclePrice
+            .sub(oracleData.price)
+            .abs()
+            .mul(numericConstants_1.PERCENTAGE_PRECISION)
+            .div(anchor_1.BN.max(oracleData.price, numericConstants_1.ONE));
         if (!(0, oracles_1.isOracleValid)(perpMarket, oracleData, stateAccountAndSlot.data.oracleGuardRails, stateAccountAndSlot.slot) ||
             perpMarket.amm.mmOraclePrice.eq(numericConstants_1.ZERO) ||
-            perpMarket.amm.mmOracleSlot < oracleData.slot) {
+            perpMarket.amm.mmOracleSlot < oracleData.slot ||
+            pctDiff.gt(numericConstants_1.PERCENTAGE_PRECISION.divn(100)) // 1% threshold
+        ) {
             return { ...oracleData, fetchedWithMMOracle: true };
         }
         else {
@@ -4440,6 +4452,7 @@ class DriftClient {
                 confidence: conf,
                 hasSufficientNumberOfDataPoints: true,
                 fetchedWithMMOracle: true,
+                isMMOracleActive: oracleData.isMMOracleActive,
             };
         }
     }

package/lib/browser/driftClientConfig.d.ts

@@ -1,8 +1,8 @@
 import { Commitment, ConfirmOptions, Connection, PublicKey, TransactionVersion } from '@solana/web3.js';
 import { IWallet, TxParams } from './types';
 import { OracleInfo } from './oracles/types';
-import { BulkAccountLoader } from './accounts/bulkAccountLoader/bulkAccountLoader';
-import { DriftEnv } from './config/types';
+import { BulkAccountLoader } from './accounts/bulkAccountLoader';
+import { DriftEnv } from './config';
 import { TxSender } from './tx/types';
 import { TxHandler, TxHandlerConfig } from './tx/txHandler';
 import { DelistedMarketSetting, GrpcConfigs } from './accounts/types';

package/lib/browser/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.129.0",
+    "version": "2.130.0",
     "name": "drift",
     "instructions": [
         {
@@ -2099,7 +2099,12 @@
                     "isSigner": false
                 }
             ],
-            "args": []
+            "args": [
+                {
+                    "name": "disableMaintenance",
+                    "type": "bool"
+                }
+            ]
         },
         {
             "name": "updateUserFuelBonus",
@@ -7531,7 +7536,7 @@
             ]
         },
         {
-            "name": "updateDisableBitflagsMmOracle",
+            "name": "updateFeatureBitFlagsMmOracle",
             "accounts": [
                 {
                     "name": "admin",
@@ -7546,7 +7551,7 @@
             ],
             "args": [
                 {
-                    "name": "disable",
+                    "name": "enable",
                     "type": "bool"
                 }
             ]
@@ -7795,11 +7800,24 @@
                         "type": "u8"
                     },
                     {
-                        "name": "padding",
+                        "name": "padding1",
                         "type": {
                             "array": [
                                 "u8",
-                                31
+                                3
+                            ]
+                        }
+                    },
+                    {
+                        "name": "currentMaintenanceUsers",
+                        "type": "u32"
+                    },
+                    {
+                        "name": "padding2",
+                        "type": {
+                            "array": [
+                                "u8",
+                                24
                             ]
                         }
                     }
@@ -8324,12 +8342,20 @@
                         "name": "protectedMakerDynamicDivisor",
                         "type": "u8"
                     },
+                    {
+                        "name": "padding1",
+                        "type": "u32"
+                    },
+                    {
+                        "name": "lastFillPrice",
+                        "type": "u64"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                36
+                                24
                             ]
                         }
                     }
@@ -9060,7 +9086,7 @@
                         "type": "u16"
                     },
                     {
-                        "name": "disableBitFlags",
+                        "name": "featureBitFlags",
                         "type": "u8"
                     },
                     {
@@ -10640,7 +10666,7 @@
                         "name": "lastFundingRate",
                         "docs": [
                             "last funding rate in this perp market (unit is quote per base)",
-                            "precision: QUOTE_PRECISION"
+                            "precision: FUNDING_RATE_PRECISION"
                         ],
                         "type": "i64"
                     },
@@ -10648,7 +10674,7 @@
                         "name": "lastFundingRateLong",
                         "docs": [
                             "last funding rate for longs in this perp market (unit is quote per base)",
-                            "precision: QUOTE_PRECISION"
+                            "precision: FUNDING_RATE_PRECISION"
                         ],
                         "type": "i64"
                     },
@@ -11078,9 +11104,13 @@
                         "type": {
                             "array": [
                                 "u8",
-                                11
+                                3
                             ]
                         }
+                    },
+                    {
+                        "name": "lastFundingOracleTwap",
+                        "type": "i64"
                     }
                 ]
             }
@@ -12002,6 +12032,26 @@
                 ]
             }
         },
+        {
+            "name": "LogMode",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "None"
+                    },
+                    {
+                        "name": "ExchangeOracle"
+                    },
+                    {
+                        "name": "MMOracle"
+                    },
+                    {
+                        "name": "SafeMMOracle"
+                    }
+                ]
+            }
+        },
         {
             "name": "PositionUpdateType",
             "type": {
@@ -12751,6 +12801,20 @@
                 ]
             }
         },
+        {
+            "name": "FeatureBitFlags",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "MmOracleUpdate"
+                    },
+                    {
+                        "name": "EnableMedianTriggerPrice"
+                    }
+                ]
+            }
+        },
         {
             "name": "UserStatus",
             "type": {
@@ -13674,6 +13738,13 @@
                         "option": "u64"
                     },
                     "index": false
+                },
+                {
+                    "name": "triggerPrice",
+                    "type": {
+                        "option": "u64"
+                    },
+                    "index": false
                 }
             ]
         },

package/lib/browser/index.d.ts

@@ -8,22 +8,22 @@ export * from './oracles/strictOraclePrice';
 export * from './types';
 export * from './constants/perpMarkets';
 export * from './accounts/fetch';
-export * from './accounts/driftClientAccount/webSocketDriftClientAccountSubscriber';
-export * from './accounts/insuranceFundStakeAccount/webSocketInsuranceFundStakeAccountSubscriber';
-export * from './accounts/highLeverageModeConfigAccount/webSocketHighLeverageModeConfigAccountSubscriber';
-export * from './accounts/bulkAccountLoader/bulkAccountLoader';
+export * from './accounts/webSocketDriftClientAccountSubscriber';
+export * from './accounts/webSocketInsuranceFundStakeAccountSubscriber';
+export * from './accounts/webSocketHighLeverageModeConfigAccountSubscriber';
+export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';
-export { CustomizedCadenceBulkAccountLoader } from './accounts/bulkAccountLoader/customizedCadenceBulkAccountLoader';
-export * from './accounts/driftClientAccount/pollingDriftClientAccountSubscriber';
-export * from './accounts/oracleAccount/pollingOracleAccountSubscriber';
-export * from './accounts/tokenAccount/pollingTokenAccountSubscriber';
-export * from './accounts/userAccount/pollingUserAccountSubscriber';
-export * from './accounts/userStatsAccount/pollingUserStatsAccountSubscriber';
-export * from './accounts/insuranceFundStakeAccount/pollingInsuranceFundStakeAccountSubscriber';
-export * from './accounts/highLeverageModeConfigAccount/pollingHighLeverageModeConfigAccountSubscriber';
-export * from './accounts/userAccount/basicUserAccountSubscriber';
-export * from './accounts/userAccount/oneShotUserAccountSubscriber';
+export { CustomizedCadenceBulkAccountLoader } from './accounts/customizedCadenceBulkAccountLoader';
+export * from './accounts/pollingDriftClientAccountSubscriber';
+export * from './accounts/pollingOracleAccountSubscriber';
+export * from './accounts/pollingTokenAccountSubscriber';
+export * from './accounts/pollingUserAccountSubscriber';
+export * from './accounts/pollingUserStatsAccountSubscriber';
+export * from './accounts/pollingInsuranceFundStakeAccountSubscriber';
+export * from './accounts/pollingHighLeverageModeConfigAccountSubscriber';
+export * from './accounts/basicUserAccountSubscriber';
+export * from './accounts/oneShotUserAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses/pda';
 export * from './adminClient';
@@ -75,9 +75,7 @@ export * from './keypair';
 export * from './types';
 export * from './math/utils';
 export * from './math/fuel';
-/** Config */
 export * from './config';
-export * from './config/types';
 export * from './constants/numericConstants';
 export * from './serum/serumSubscriber';
 export * from './serum/serumFulfillmentConfigMap';
@@ -110,21 +108,16 @@ export * from './util/pythOracleUtils';
 export * from './math/spotBalance';
 export * from './constants/spotMarkets';
 export * from './driftClientConfig';
-/** DLOB */
 export * from './dlob/DLOB';
 export * from './dlob/DLOBNode';
 export * from './dlob/NodeList';
 export * from './dlob/DLOBSubscriber';
 export * from './dlob/types';
 export * from './dlob/orderBookLevels';
-export * from './dlob/utils';
-/** UserMap */
 export * from './userMap/userMap';
 export * from './userMap/referrerMap';
 export * from './userMap/userStatsMap';
 export * from './userMap/userMapConfig';
-export * from './userMap/events';
-export * from './userMap/types';
 export * from './math/bankruptcy';
 export * from './orderSubscriber';
 export * from './orderSubscriber/types';

package/lib/browser/index.js

@@ -31,23 +31,23 @@ __exportStar(require("./oracles/strictOraclePrice"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./constants/perpMarkets"), exports);
 __exportStar(require("./accounts/fetch"), exports);
-__exportStar(require("./accounts/driftClientAccount/webSocketDriftClientAccountSubscriber"), exports);
-__exportStar(require("./accounts/insuranceFundStakeAccount/webSocketInsuranceFundStakeAccountSubscriber"), exports);
-__exportStar(require("./accounts/highLeverageModeConfigAccount/webSocketHighLeverageModeConfigAccountSubscriber"), exports);
-__exportStar(require("./accounts/bulkAccountLoader/bulkAccountLoader"), exports);
+__exportStar(require("./accounts/webSocketDriftClientAccountSubscriber"), exports);
+__exportStar(require("./accounts/webSocketInsuranceFundStakeAccountSubscriber"), exports);
+__exportStar(require("./accounts/webSocketHighLeverageModeConfigAccountSubscriber"), exports);
+__exportStar(require("./accounts/bulkAccountLoader"), exports);
 __exportStar(require("./accounts/bulkUserSubscription"), exports);
 __exportStar(require("./accounts/bulkUserStatsSubscription"), exports);
-var customizedCadenceBulkAccountLoader_1 = require("./accounts/bulkAccountLoader/customizedCadenceBulkAccountLoader");
+var customizedCadenceBulkAccountLoader_1 = require("./accounts/customizedCadenceBulkAccountLoader");
 Object.defineProperty(exports, "CustomizedCadenceBulkAccountLoader", { enumerable: true, get: function () { return customizedCadenceBulkAccountLoader_1.CustomizedCadenceBulkAccountLoader; } });
-__exportStar(require("./accounts/driftClientAccount/pollingDriftClientAccountSubscriber"), exports);
-__exportStar(require("./accounts/oracleAccount/pollingOracleAccountSubscriber"), exports);
-__exportStar(require("./accounts/tokenAccount/pollingTokenAccountSubscriber"), exports);
-__exportStar(require("./accounts/userAccount/pollingUserAccountSubscriber"), exports);
-__exportStar(require("./accounts/userStatsAccount/pollingUserStatsAccountSubscriber"), exports);
-__exportStar(require("./accounts/insuranceFundStakeAccount/pollingInsuranceFundStakeAccountSubscriber"), exports);
-__exportStar(require("./accounts/highLeverageModeConfigAccount/pollingHighLeverageModeConfigAccountSubscriber"), exports);
-__exportStar(require("./accounts/userAccount/basicUserAccountSubscriber"), exports);
-__exportStar(require("./accounts/userAccount/oneShotUserAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingDriftClientAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingOracleAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingUserAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingUserStatsAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingInsuranceFundStakeAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingHighLeverageModeConfigAccountSubscriber"), exports);
+__exportStar(require("./accounts/basicUserAccountSubscriber"), exports);
+__exportStar(require("./accounts/oneShotUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
 __exportStar(require("./addresses/pda"), exports);
 __exportStar(require("./adminClient"), exports);
@@ -99,9 +99,7 @@ __exportStar(require("./keypair"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./math/utils"), exports);
 __exportStar(require("./math/fuel"), exports);
-/** Config */
 __exportStar(require("./config"), exports);
-__exportStar(require("./config/types"), exports);
 __exportStar(require("./constants/numericConstants"), exports);
 __exportStar(require("./serum/serumSubscriber"), exports);
 __exportStar(require("./serum/serumFulfillmentConfigMap"), exports);
@@ -134,21 +132,16 @@ __exportStar(require("./util/pythOracleUtils"), exports);
 __exportStar(require("./math/spotBalance"), exports);
 __exportStar(require("./constants/spotMarkets"), exports);
 __exportStar(require("./driftClientConfig"), exports);
-/** DLOB */
 __exportStar(require("./dlob/DLOB"), exports);
 __exportStar(require("./dlob/DLOBNode"), exports);
 __exportStar(require("./dlob/NodeList"), exports);
 __exportStar(require("./dlob/DLOBSubscriber"), exports);
 __exportStar(require("./dlob/types"), exports);
 __exportStar(require("./dlob/orderBookLevels"), exports);
-__exportStar(require("./dlob/utils"), exports);
-/** UserMap */
 __exportStar(require("./userMap/userMap"), exports);
 __exportStar(require("./userMap/referrerMap"), exports);
 __exportStar(require("./userMap/userStatsMap"), exports);
 __exportStar(require("./userMap/userMapConfig"), exports);
-__exportStar(require("./userMap/events"), exports);
-__exportStar(require("./userMap/types"), exports);
 __exportStar(require("./math/bankruptcy"), exports);
 __exportStar(require("./orderSubscriber"), exports);
 __exportStar(require("./orderSubscriber/types"), exports);

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

@@ -12,6 +12,10 @@ export declare function calculateUpdatedAMMSpreadReserves(amm: AMM, direction: P
     sqrtK: BN;
     newPeg: BN;
 };
+export declare function calculateAMMBidAskPrice(amm: AMM, oraclePriceData: OraclePriceData, withUpdate?: boolean, isPrediction?: boolean): [BN, BN];
+/**
+ * @deprecated Use calculateAMMBidAskPrice instead
+ */
 export declare function calculateBidAskPrice(amm: AMM, oraclePriceData: OraclePriceData, withUpdate?: boolean, isPrediction?: boolean): [BN, BN];
 /**
  * Calculates a price given an arbitrary base and quote amount (they must have the same precision)

package/lib/browser/math/amm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateMaxBaseAssetAmountFillable = exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.getQuoteAssetReservePredictionMarketBounds = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateVolSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateReferencePriceOffset = exports.calculateInventoryScale = exports.calculateInventoryLiquidityRatio = exports.calculateMarketOpenBidAsk = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
+exports.calculateMaxBaseAssetAmountFillable = exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.getQuoteAssetReservePredictionMarketBounds = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateVolSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateReferencePriceOffset = exports.calculateInventoryScale = exports.calculateInventoryLiquidityRatio = exports.calculateMarketOpenBidAsk = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateAMMBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
@@ -82,9 +82,6 @@ function calculateNewAmm(amm, oraclePriceData) {
 }
 exports.calculateNewAmm = calculateNewAmm;
 function calculateUpdatedAMM(amm, oraclePriceData) {
-    if (!(oraclePriceData === null || oraclePriceData === void 0 ? void 0 : oraclePriceData.fetchedWithMMOracle)) {
-        console.log('Use driftClient method getMMOracleDataForPerpMarket for accurate MM pricing');
-    }
     if (amm.curveUpdateIntensity == 0 || oraclePriceData === undefined) {
         return amm;
     }
@@ -108,8 +105,9 @@ function calculateUpdatedAMM(amm, oraclePriceData) {
 }
 exports.calculateUpdatedAMM = calculateUpdatedAMM;
 function calculateUpdatedAMMSpreadReserves(amm, direction, oraclePriceData, isPrediction = false) {
-    if (!(oraclePriceData === null || oraclePriceData === void 0 ? void 0 : oraclePriceData.fetchedWithMMOracle)) {
-        console.log('Use driftClient method getMMOracleDataForPerpMarket for accurate MM pricing');
+    if (!(oraclePriceData === null || oraclePriceData === void 0 ? void 0 : oraclePriceData.fetchedWithMMOracle) &&
+        (oraclePriceData === null || oraclePriceData === void 0 ? void 0 : oraclePriceData.isMMOracleActive)) {
+        console.log('Use driftClient method getMMOracleDataForPerpMarket for accurate updated AMM in calculateUpdatedAMMSpreadReserves');
     }
     const newAmm = calculateUpdatedAMM(amm, oraclePriceData);
     const [shortReserves, longReserves] = calculateSpreadReserves(newAmm, oraclePriceData, undefined, isPrediction);
@@ -125,10 +123,28 @@ function calculateUpdatedAMMSpreadReserves(amm, direction, oraclePriceData, isPr
     return result;
 }
 exports.calculateUpdatedAMMSpreadReserves = calculateUpdatedAMMSpreadReserves;
-function calculateBidAskPrice(amm, oraclePriceData, withUpdate = true, isPrediction = false) {
-    if (!(oraclePriceData === null || oraclePriceData === void 0 ? void 0 : oraclePriceData.fetchedWithMMOracle)) {
-        console.log('Use driftClient method getMMOracleDataForPerpMarket for accurate MM pricing');
+function calculateAMMBidAskPrice(amm, oraclePriceData, withUpdate = true, isPrediction = false) {
+    if (!(oraclePriceData === null || oraclePriceData === void 0 ? void 0 : oraclePriceData.fetchedWithMMOracle) &&
+        (oraclePriceData === null || oraclePriceData === void 0 ? void 0 : oraclePriceData.isMMOracleActive)) {
+        console.log('Use driftClient method getMMOracleDataForPerpMarket for accurate MM pricing in calculateAMMBidAskPrice');
+    }
+    let newAmm;
+    if (withUpdate) {
+        newAmm = calculateUpdatedAMM(amm, oraclePriceData);
+    }
+    else {
+        newAmm = amm;
     }
+    const [bidReserves, askReserves] = calculateSpreadReserves(newAmm, oraclePriceData, undefined, isPrediction);
+    const askPrice = calculatePrice(askReserves.baseAssetReserve, askReserves.quoteAssetReserve, newAmm.pegMultiplier);
+    const bidPrice = calculatePrice(bidReserves.baseAssetReserve, bidReserves.quoteAssetReserve, newAmm.pegMultiplier);
+    return [bidPrice, askPrice];
+}
+exports.calculateAMMBidAskPrice = calculateAMMBidAskPrice;
+/**
+ * @deprecated Use calculateAMMBidAskPrice instead
+ */
+function calculateBidAskPrice(amm, oraclePriceData, withUpdate = true, isPrediction = false) {
     let newAmm;
     if (withUpdate) {
         newAmm = calculateUpdatedAMM(amm, oraclePriceData);

package/lib/browser/math/margin.js

@@ -6,7 +6,7 @@ const numericConstants_1 = require("../constants/numericConstants");
 const anchor_1 = require("@coral-xyz/anchor");
 const market_1 = require("./market");
 const spotBalance_1 = require("./spotBalance");
-const oneShotUserAccountSubscriber_1 = require("../accounts/userAccount/oneShotUserAccountSubscriber");
+const oneShotUserAccountSubscriber_1 = require("../accounts/oneShotUserAccountSubscriber");
 const user_1 = require("../user");
 const types_1 = require("../types");
 const assert_1 = require("../assert/assert");

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

@@ -38,3 +38,13 @@ export declare function calculateAvailablePerpLiquidity(market: PerpMarketAccoun
     asks: BN;
 };
 export declare function calculatePerpMarketBaseLiquidatorFee(market: PerpMarketAccount, userHighLeverageMode: boolean): number;
+/**
+ * Calculates trigger price for a perp market based on oracle price and current time
+ * Implements the same logic as the Rust get_trigger_price function
+ *
+ * @param market - The perp market account
+ * @param oraclePrice - Current oracle price (precision: PRICE_PRECISION)
+ * @param now - Current timestamp in seconds
+ * @returns trigger price (precision: PRICE_PRECISION)
+ */
+export declare function getTriggerPrice(market: PerpMarketAccount, oraclePrice: BN, now: BN, useMedianPrice: boolean): BN;

package/lib/browser/math/market.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculatePerpMarketBaseLiquidatorFee = exports.calculateAvailablePerpLiquidity = exports.calculateNetUserPnlImbalance = exports.calculateNetUserPnl = exports.calculateMarketMaxAvailableInsurance = exports.calculateMarketAvailablePNL = exports.calculateUnrealizedAssetWeight = exports.calculateMarketMarginRatio = exports.calculateOracleSpread = exports.calculateOracleReserveSpread = exports.calculateNewMarketAfterTrade = exports.calculateAskPrice = exports.calculateBidPrice = exports.calculateReservePrice = void 0;
+exports.getTriggerPrice = exports.calculatePerpMarketBaseLiquidatorFee = exports.calculateAvailablePerpLiquidity = exports.calculateNetUserPnlImbalance = exports.calculateNetUserPnl = exports.calculateMarketMaxAvailableInsurance = exports.calculateMarketAvailablePNL = exports.calculateUnrealizedAssetWeight = exports.calculateMarketMarginRatio = exports.calculateOracleSpread = exports.calculateOracleReserveSpread = exports.calculateNewMarketAfterTrade = exports.calculateAskPrice = exports.calculateBidPrice = exports.calculateReservePrice = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const types_1 = require("../types");
 const amm_1 = require("./amm");
@@ -172,3 +172,78 @@ function calculatePerpMarketBaseLiquidatorFee(market, userHighLeverageMode) {
     }
 }
 exports.calculatePerpMarketBaseLiquidatorFee = calculatePerpMarketBaseLiquidatorFee;
+/**
+ * Calculates trigger price for a perp market based on oracle price and current time
+ * Implements the same logic as the Rust get_trigger_price function
+ *
+ * @param market - The perp market account
+ * @param oraclePrice - Current oracle price (precision: PRICE_PRECISION)
+ * @param now - Current timestamp in seconds
+ * @returns trigger price (precision: PRICE_PRECISION)
+ */
+function getTriggerPrice(market, oraclePrice, now, useMedianPrice) {
+    if (!useMedianPrice) {
+        return oraclePrice.abs();
+    }
+    const lastFillPrice = market.lastFillPrice;
+    // Calculate 5-minute basis
+    const markPrice5minTwap = market.amm.lastMarkPriceTwap5Min;
+    const lastOraclePriceTwap5min = market.amm.historicalOracleData.lastOraclePriceTwap5Min;
+    const basis5min = markPrice5minTwap.sub(lastOraclePriceTwap5min);
+    const oraclePlusBasis5min = oraclePrice.add(basis5min);
+    // Calculate funding basis
+    const lastFundingBasis = getLastFundingBasis(market, oraclePrice, now);
+    const oraclePlusFundingBasis = oraclePrice.add(lastFundingBasis);
+    const prices = [
+        lastFillPrice.gt(numericConstants_1.ZERO) ? lastFillPrice : oraclePrice,
+        oraclePlusFundingBasis,
+        oraclePlusBasis5min,
+    ].sort((a, b) => a.cmp(b));
+    const medianPrice = prices[1];
+    return clampTriggerPrice(market, oraclePrice.abs(), medianPrice);
+}
+exports.getTriggerPrice = getTriggerPrice;
+/**
+ * Calculates the last funding basis for trigger price calculation
+ * Implements the same logic as the Rust get_last_funding_basis function
+ */
+function getLastFundingBasis(market, oraclePrice, now) {
+    if (market.amm.lastFundingOracleTwap.gt(numericConstants_1.ZERO)) {
+        const lastFundingRate = market.amm.lastFundingRate
+            .mul(numericConstants_1.PRICE_PRECISION)
+            .div(market.amm.lastFundingOracleTwap)
+            .muln(24);
+        const lastFundingRatePreAdj = lastFundingRate.sub(numericConstants_1.FUNDING_RATE_PRECISION.div(new anchor_1.BN(5000)) // FUNDING_RATE_OFFSET_PERCENTAGE
+        );
+        const timeLeftUntilFundingUpdate = anchor_1.BN.min(anchor_1.BN.max(now.sub(market.amm.lastFundingRateTs), numericConstants_1.ZERO), market.amm.fundingPeriod);
+        const lastFundingBasis = oraclePrice
+            .mul(lastFundingRatePreAdj)
+            .div(numericConstants_1.PERCENTAGE_PRECISION)
+            .mul(market.amm.fundingPeriod.sub(timeLeftUntilFundingUpdate))
+            .div(market.amm.fundingPeriod)
+            .div(new anchor_1.BN(1000)); // FUNDING_RATE_BUFFER
+        return lastFundingBasis;
+    }
+    else {
+        return numericConstants_1.ZERO;
+    }
+}
+/**
+ * Clamps trigger price based on contract tier
+ * Implements the same logic as the Rust clamp_trigger_price function
+ */
+function clampTriggerPrice(market, oraclePrice, medianPrice) {
+    let maxBpsDiff;
+    const tier = market.contractTier;
+    if ((0, types_1.isVariant)(tier, 'a') || (0, types_1.isVariant)(tier, 'b')) {
+        maxBpsDiff = new anchor_1.BN(500); // 20 BPS
+    }
+    else if ((0, types_1.isVariant)(tier, 'c')) {
+        maxBpsDiff = new anchor_1.BN(100); // 100 BPS
+    }
+    else {
+        maxBpsDiff = new anchor_1.BN(40); // 250 BPS
+    }
+    const maxOracleDiff = oraclePrice.div(maxBpsDiff);
+    return anchor_1.BN.min(anchor_1.BN.max(medianPrice, oraclePrice.sub(maxOracleDiff)), oraclePrice.add(maxOracleDiff));
+}

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

@@ -23,3 +23,4 @@ export declare function isTriggered(order: Order): boolean;
 export declare function isRestingLimitOrder(order: Order, slot: number): boolean;
 export declare function isTakingOrder(order: Order, slot: number): boolean;
 export declare function isSignedMsgOrder(order: Order): boolean;
+export declare function calculateOrderBaseAssetAmount(order: Order, existingBaseAssetAmount: BN): BN;