@drift-labs/sdk 2.162.0-beta.2 → 2.163.0-beta.9

package/lib/browser/index.js

@@ -18,6 +18,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pyth = exports.PublicKey = exports.BN = exports.PythLazerSubscriber = exports.CustomizedCadenceBulkAccountLoader = exports.WebSocketDriftClientAccountSubscriberV2 = exports.WebSocketProgramAccountsSubscriberV2 = exports.WebSocketProgramUserAccountSubscriber = exports.WebSocketProgramAccountSubscriber = exports.WebSocketAccountSubscriberV2 = void 0;
+/**
+ * @module @drift-labs/sdk
+ * Main package barrel — re-exports all public SDK types, classes, and utilities.
+ *
+ * Primary entry points:
+ *   {@link DriftClient}  — trading and keeper instruction builders (driftClient.ts)
+ *   {@link AdminClient}  — governance/admin instruction builders (adminClient.ts)
+ *   {@link User}         — user account abstraction: margin queries, position accessors (user.ts)
+ *   {@link DLOB}         — decentralized limit order book (dlob/DLOB.ts)
+ *
+ * Key re-exported namespaces: types, addresses/pda, accounts (subscribers), math, events, oracles, constants.
+ */
 const anchor_1 = require("@coral-xyz/anchor");
 Object.defineProperty(exports, "BN", { enumerable: true, get: function () { return anchor_1.BN; } });
 const web3_js_1 = require("@solana/web3.js");
@@ -32,7 +44,6 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./accounts/fetch"), exports);
 __exportStar(require("./accounts/webSocketDriftClientAccountSubscriber"), exports);
 __exportStar(require("./accounts/webSocketInsuranceFundStakeAccountSubscriber"), exports);
-__exportStar(require("./accounts/webSocketHighLeverageModeConfigAccountSubscriber"), exports);
 var webSocketAccountSubscriberV2_1 = require("./accounts/webSocketAccountSubscriberV2");
 Object.defineProperty(exports, "WebSocketAccountSubscriberV2", { enumerable: true, get: function () { return webSocketAccountSubscriberV2_1.WebSocketAccountSubscriberV2; } });
 var webSocketProgramAccountSubscriber_1 = require("./accounts/webSocketProgramAccountSubscriber");
@@ -54,7 +65,6 @@ __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/oneShotUserStatsAccountSubscriber"), exports);
@@ -123,9 +133,7 @@ __exportStar(require("./phoenix/phoenixFulfillmentConfigMap"), exports);
 __exportStar(require("./openbook/openbookV2Subscriber"), exports);
 __exportStar(require("./openbook/openbookV2FulfillmentConfigMap"), exports);
 __exportStar(require("./oracles/pythClient"), exports);
-__exportStar(require("./oracles/pythPullClient"), exports);
 __exportStar(require("./oracles/pythLazerClient"), exports);
-__exportStar(require("./oracles/switchboardOnDemandClient"), exports);
 __exportStar(require("./oracles/oracleId"), exports);
 __exportStar(require("./oracles/utils"), exports);
 __exportStar(require("./swift/swiftOrderSubscriber"), exports);
@@ -143,7 +151,6 @@ __exportStar(require("./util/computeUnits"), exports);
 __exportStar(require("./util/digest"), exports);
 __exportStar(require("./util/tps"), exports);
 __exportStar(require("./util/promiseTimeout"), exports);
-__exportStar(require("./util/pythOracleUtils"), exports);
 __exportStar(require("./math/spotBalance"), exports);
 __exportStar(require("./driftClientConfig"), exports);
 __exportStar(require("./dlob/DLOB"), exports);

package/lib/browser/marinade/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { AnchorProvider, BN, Program } from '@coral-xyz/anchor';
+import { AnchorProvider, BN, Program } from '@coral-xyz/anchor-29';
 import { MarinadeFinance } from './types';
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
 export declare function getMarinadeFinanceProgram(provider: AnchorProvider): Program<MarinadeFinance>;

package/lib/browser/marinade/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMarinadeMSolPrice = exports.getMarinadeDepositIx = exports.getMarinadeFinanceProgram = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
+const anchor_29_1 = require("@coral-xyz/anchor-29");
 const types_1 = require("./types");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const marinadeFinanceProgramId = new web3_js_1.PublicKey('MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD');
 function getMarinadeFinanceProgram(provider) {
-    return new anchor_1.Program(types_1.IDL, marinadeFinanceProgramId, provider);
+    return new anchor_29_1.Program(types_1.IDL, marinadeFinanceProgramId, provider);
 }
 exports.getMarinadeFinanceProgram = getMarinadeFinanceProgram;
 function getMarinadeDepositIx({ program, amount, mSOLAccount, transferFrom, }) {

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

@@ -6,13 +6,13 @@ export declare function calculatePegFromTargetPrice(targetPrice: BN, baseAssetRe
 export declare function calculateOptimalPegAndBudget(amm: AMM, mmOraclePriceData: MMOraclePriceData): [BN, BN, BN, boolean];
 export declare function calculateNewAmm(amm: AMM, mmOraclePriceData: MMOraclePriceData): [BN, BN, BN, BN];
 export declare function calculateUpdatedAMM(amm: AMM, mmOraclePriceData: MMOraclePriceData): AMM;
-export declare function calculateUpdatedAMMSpreadReserves(amm: AMM, direction: PositionDirection, mmOraclePriceData: MMOraclePriceData, isPrediction?: boolean, latestSlot?: BN): {
+export declare function calculateUpdatedAMMSpreadReserves(amm: AMM, direction: PositionDirection, mmOraclePriceData: MMOraclePriceData, latestSlot?: BN): {
     baseAssetReserve: BN;
     quoteAssetReserve: BN;
     sqrtK: BN;
     newPeg: BN;
 };
-export declare function calculateBidAskPrice(amm: AMM, mmOraclePriceData: MMOraclePriceData, withUpdate?: boolean, isPrediction?: boolean, latestSlot?: BN): [BN, BN];
+export declare function calculateBidAskPrice(amm: AMM, mmOraclePriceData: MMOraclePriceData, withUpdate?: boolean, latestSlot?: BN): [BN, BN];
 /**
  * Calculates a price given an arbitrary base and quote amount (they must have the same precision)
  *
@@ -65,8 +65,7 @@ export declare function calculateSpreadBN(baseSpread: number, lastOracleReserveP
     shortSpread: number;
 };
 export declare function calculateSpread(amm: AMM, oraclePriceData: OraclePriceData, now?: BN, reservePrice?: BN): [number, number];
-export declare function getQuoteAssetReservePredictionMarketBounds(amm: AMM, direction: PositionDirection): [BN, BN];
-export declare function calculateSpreadReserves(amm: AMM, mmOraclePriceData: MMOraclePriceData, now?: BN, isPrediction?: boolean, latestSlot?: BN): {
+export declare function calculateSpreadReserves(amm: AMM, mmOraclePriceData: MMOraclePriceData, now?: BN, latestSlot?: BN): {
     baseAssetReserve: any;
     quoteAssetReserve: any;
 }[];
@@ -94,6 +93,6 @@ export declare function getSwapDirection(inputAssetType: AssetType, positionDire
  * @returns cost : Precision PRICE_PRECISION
  */
 export declare function calculateTerminalPrice(market: PerpMarketAccount): BN;
-export declare function calculateMaxBaseAssetAmountToTrade(amm: AMM, limit_price: BN, direction: PositionDirection, mmOraclePriceData?: MMOraclePriceData, now?: BN, isPrediction?: boolean): [BN, PositionDirection];
+export declare function calculateMaxBaseAssetAmountToTrade(amm: AMM, limit_price: BN, direction: PositionDirection, mmOraclePriceData?: MMOraclePriceData, now?: BN): [BN, PositionDirection];
 export declare function calculateQuoteAssetAmountSwapped(quoteAssetReserves: BN, pegMultiplier: BN, swapDirection: SwapDirection): BN;
 export declare function calculateMaxBaseAssetAmountFillable(amm: AMM, orderDirection: PositionDirection): BN;

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.calculateInventoryLiquidityRatioForReferencePriceOffset = 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.calculateSpread = exports.calculateSpreadBN = exports.calculateVolSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateReferencePriceOffset = exports.calculateInventoryScale = exports.calculateInventoryLiquidityRatioForReferencePriceOffset = exports.calculateInventoryLiquidityRatio = exports.calculateMarketOpenBidAsk = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = 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");
@@ -104,9 +104,9 @@ function calculateUpdatedAMM(amm, mmOraclePriceData) {
     return newAmm;
 }
 exports.calculateUpdatedAMM = calculateUpdatedAMM;
-function calculateUpdatedAMMSpreadReserves(amm, direction, mmOraclePriceData, isPrediction = false, latestSlot) {
+function calculateUpdatedAMMSpreadReserves(amm, direction, mmOraclePriceData, latestSlot) {
     const newAmm = calculateUpdatedAMM(amm, mmOraclePriceData);
-    const [shortReserves, longReserves] = calculateSpreadReserves(newAmm, mmOraclePriceData, undefined, isPrediction, latestSlot);
+    const [shortReserves, longReserves] = calculateSpreadReserves(newAmm, mmOraclePriceData, undefined, latestSlot);
     const dirReserves = (0, types_1.isVariant)(direction, 'long')
         ? longReserves
         : shortReserves;
@@ -119,7 +119,7 @@ function calculateUpdatedAMMSpreadReserves(amm, direction, mmOraclePriceData, is
     return result;
 }
 exports.calculateUpdatedAMMSpreadReserves = calculateUpdatedAMMSpreadReserves;
-function calculateBidAskPrice(amm, mmOraclePriceData, withUpdate = true, isPrediction = false, latestSlot) {
+function calculateBidAskPrice(amm, mmOraclePriceData, withUpdate = true, latestSlot) {
     let newAmm;
     if (withUpdate) {
         newAmm = calculateUpdatedAMM(amm, mmOraclePriceData);
@@ -127,7 +127,7 @@ function calculateBidAskPrice(amm, mmOraclePriceData, withUpdate = true, isPredi
     else {
         newAmm = amm;
     }
-    const [bidReserves, askReserves] = calculateSpreadReserves(newAmm, mmOraclePriceData, undefined, isPrediction, latestSlot);
+    const [bidReserves, askReserves] = calculateSpreadReserves(newAmm, mmOraclePriceData, undefined, latestSlot);
     const askPrice = calculatePrice(askReserves.baseAssetReserve, askReserves.quoteAssetReserve, newAmm.pegMultiplier);
     const bidPrice = calculatePrice(bidReserves.baseAssetReserve, bidReserves.quoteAssetReserve, newAmm.pegMultiplier);
     return [bidPrice, askPrice];
@@ -475,30 +475,7 @@ function calculateSpread(amm, oraclePriceData, now, reservePrice) {
     return [longSpread, shortSpread];
 }
 exports.calculateSpread = calculateSpread;
-function getQuoteAssetReservePredictionMarketBounds(amm, direction) {
-    let quoteAssetReserveLowerBound = numericConstants_1.ZERO;
-    const pegSqrt = (0, utils_1.squareRootBN)(amm.pegMultiplier.mul(numericConstants_1.PEG_PRECISION).addn(1)).addn(1);
-    let quoteAssetReserveUpperBound = amm.sqrtK
-        .mul(pegSqrt)
-        .div(amm.pegMultiplier);
-    if (direction === types_1.PositionDirection.LONG) {
-        quoteAssetReserveLowerBound = amm.sqrtK
-            .muln(22361)
-            .mul(pegSqrt)
-            .divn(100000)
-            .div(amm.pegMultiplier);
-    }
-    else {
-        quoteAssetReserveUpperBound = amm.sqrtK
-            .muln(97467)
-            .mul(pegSqrt)
-            .divn(100000)
-            .div(amm.pegMultiplier);
-    }
-    return [quoteAssetReserveLowerBound, quoteAssetReserveUpperBound];
-}
-exports.getQuoteAssetReservePredictionMarketBounds = getQuoteAssetReservePredictionMarketBounds;
-function calculateSpreadReserves(amm, mmOraclePriceData, now, isPrediction = false, latestSlot) {
+function calculateSpreadReserves(amm, mmOraclePriceData, now, latestSlot) {
     function calculateSpreadReserve(spread, direction, amm) {
         if (spread === 0) {
             return {
@@ -519,10 +496,6 @@ function calculateSpreadReserves(amm, mmOraclePriceData, now, isPrediction = fal
         else {
             quoteAssetReserve = amm.quoteAssetReserve.sub(quoteAssetReserveDelta.abs());
         }
-        if (isPrediction) {
-            const [qarLower, qarUpper] = getQuoteAssetReservePredictionMarketBounds(amm, direction);
-            quoteAssetReserve = (0, utils_1.clampBN)(quoteAssetReserve, qarLower, qarUpper);
-        }
         const baseAssetReserve = amm.sqrtK.mul(amm.sqrtK).div(quoteAssetReserve);
         return {
             baseAssetReserve,
@@ -641,7 +614,7 @@ function calculateTerminalPrice(market) {
     return terminalPrice;
 }
 exports.calculateTerminalPrice = calculateTerminalPrice;
-function calculateMaxBaseAssetAmountToTrade(amm, limit_price, direction, mmOraclePriceData, now, isPrediction = false) {
+function calculateMaxBaseAssetAmountToTrade(amm, limit_price, direction, mmOraclePriceData, now) {
     const invariant = amm.sqrtK.mul(amm.sqrtK);
     const newBaseAssetReserveSquared = invariant
         .mul(numericConstants_1.PRICE_PRECISION)
@@ -649,7 +622,7 @@ function calculateMaxBaseAssetAmountToTrade(amm, limit_price, direction, mmOracl
         .div(limit_price)
         .div(numericConstants_1.PEG_PRECISION);
     const newBaseAssetReserve = (0, utils_1.squareRootBN)(newBaseAssetReserveSquared);
-    const [shortSpreadReserves, longSpreadReserves] = calculateSpreadReserves(amm, mmOraclePriceData, now, isPrediction);
+    const [shortSpreadReserves, longSpreadReserves] = calculateSpreadReserves(amm, mmOraclePriceData, now);
     const baseAssetReserveBefore = (0, types_1.isVariant)(direction, 'long')
         ? longSpreadReserves.baseAssetReserve
         : shortSpreadReserves.baseAssetReserve;

package/lib/browser/math/funding.js

@@ -75,7 +75,12 @@ function calculateAllEstimatedFundingRate(market, mmOraclePriceData, oraclePrice
     // 	console.log('shrink orac:', liveOracleTwap.toString(), '->', oracleTwap.toString());
     // }
     const twapSpread = markTwap.sub(oracleTwap);
-    const twapSpreadWithOffset = twapSpread.add(oracleTwap.abs().div(numericConstants_1.FUNDING_RATE_OFFSET_DENOMINATOR));
+    const offset = oracleTwap.abs().div(numericConstants_1.FUNDING_RATE_OFFSET_DENOMINATOR);
+    const twapSpreadWithOffset = twapSpread
+        .abs()
+        .lte(oracleTwap.abs().div(numericConstants_1.FUNDING_RATE_CLAMP_DENOMINATOR))
+        ? offset
+        : twapSpread.add(offset);
     const maxSpread = getMaxPriceDivergenceForFundingRate(market, oracleTwap);
     const clampedSpreadWithOffset = (0, utils_1.clampBN)(twapSpreadWithOffset, maxSpread.mul(new anchor_1.BN(-1)), maxSpread);
     const twapSpreadPct = clampedSpreadWithOffset

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

@@ -23,24 +23,23 @@ export declare function calculateWorstCasePerpLiabilityValue(perpPosition: PerpP
     worstCaseBaseAssetAmount: BN;
     worstCaseLiabilityValue: BN;
 };
-export declare function calculatePerpLiabilityValue(baseAssetAmount: BN, price: BN, isPredictionMarket: boolean): BN;
+export declare function calculatePerpLiabilityValue(baseAssetAmount: BN, price: BN): BN;
 /**
  * Calculates the margin required to open a trade, in quote amount. Only accounts for the trade size as a scalar value, does not account for the trade direction or current open positions and whether the trade would _actually_ be risk-increasing and use any extra collateral.
  * @param targetMarketIndex
  * @param baseSize
  * @returns
  */
-export declare function calculateMarginUSDCRequiredForTrade(driftClient: DriftClient, targetMarketIndex: number, baseSize: BN, userMaxMarginRatio?: number, userHighLeverageMode?: boolean, entryPrice?: BN): BN;
+export declare function calculateMarginUSDCRequiredForTrade(driftClient: DriftClient, targetMarketIndex: number, baseSize: BN, userMaxMarginRatio?: number, entryPrice?: BN): BN;
 /**
  * Similar to calculatetMarginUSDCRequiredForTrade, but calculates how much of a given collateral is required to cover the margin requirements for a given trade. Basically does the same thing as getMarginUSDCRequiredForTrade but also accounts for asset weight of the selected collateral.
  *
  * Returns collateral required in the precision of the target collateral market.
  */
-export declare function calculateCollateralDepositRequiredForTrade(driftClient: DriftClient, targetMarketIndex: number, baseSize: BN, collateralIndex: number, userMaxMarginRatio?: number, userHighLeverageMode?: boolean, estEntryPrice?: BN): BN;
+export declare function calculateCollateralDepositRequiredForTrade(driftClient: DriftClient, targetMarketIndex: number, baseSize: BN, collateralIndex: number, userMaxMarginRatio?: number, estEntryPrice?: BN): BN;
 export declare function calculateCollateralValueOfDeposit(driftClient: DriftClient, collateralIndex: number, baseSize: BN): BN;
 export declare function calculateLiquidationPrice(freeCollateral: BN, freeCollateralDelta: BN, oraclePrice: BN): BN;
 export declare function calculateUserMaxPerpOrderSize(driftClient: DriftClient, userAccountKey: PublicKey, userAccount: UserAccount, targetMarketIndex: number, tradeSide: PositionDirection): {
     tradeSize: BN;
     oppositeSideTradeSize: BN;
 };
-export declare function calcHighLeverageModeInitialMarginRatioFromSize(preSizeAdjMarginRatio: BN, sizeAdjMarginRatio: BN, defaultMarginRatio: BN): BN;

package/lib/browser/math/margin.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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;
+/**
+ * Margin calculation helpers — TypeScript mirror of `programs/drift/src/math/margin.rs`.
+ * Computes initial/maintenance margin requirements, free collateral, and account health.
+ * Used by {@link User} for leverage queries and by keeper bots for liquidation eligibility checks.
+ */
 const utils_1 = require("./utils");
 const numericConstants_1 = require("../constants/numericConstants");
 const anchor_1 = require("@coral-xyz/anchor");
@@ -90,18 +95,17 @@ function calculateWorstCaseBaseAssetAmount(perpPosition, perpMarket, oraclePrice
 }
 exports.calculateWorstCaseBaseAssetAmount = calculateWorstCaseBaseAssetAmount;
 function calculateWorstCasePerpLiabilityValue(perpPosition, perpMarket, oraclePrice, includeOpenOrders = true) {
-    const isPredictionMarket = (0, types_1.isVariant)(perpMarket.contractType, 'prediction');
     // return early if no open orders required
     if (!includeOpenOrders) {
         return {
             worstCaseBaseAssetAmount: perpPosition.baseAssetAmount,
-            worstCaseLiabilityValue: calculatePerpLiabilityValue(perpPosition.baseAssetAmount, oraclePrice, isPredictionMarket),
+            worstCaseLiabilityValue: calculatePerpLiabilityValue(perpPosition.baseAssetAmount, oraclePrice),
         };
     }
     const allBids = perpPosition.baseAssetAmount.add(perpPosition.openBids);
     const allAsks = perpPosition.baseAssetAmount.add(perpPosition.openAsks);
-    const allBidsLiabilityValue = calculatePerpLiabilityValue(allBids, oraclePrice, isPredictionMarket);
-    const allAsksLiabilityValue = calculatePerpLiabilityValue(allAsks, oraclePrice, isPredictionMarket);
+    const allBidsLiabilityValue = calculatePerpLiabilityValue(allBids, oraclePrice);
+    const allAsksLiabilityValue = calculatePerpLiabilityValue(allAsks, oraclePrice);
     if (allAsksLiabilityValue.gte(allBidsLiabilityValue)) {
         return {
             worstCaseBaseAssetAmount: allAsks,
@@ -116,21 +120,8 @@ function calculateWorstCasePerpLiabilityValue(perpPosition, perpMarket, oraclePr
     }
 }
 exports.calculateWorstCasePerpLiabilityValue = calculateWorstCasePerpLiabilityValue;
-function calculatePerpLiabilityValue(baseAssetAmount, price, isPredictionMarket) {
-    if (isPredictionMarket) {
-        if (baseAssetAmount.gt(numericConstants_1.ZERO)) {
-            return baseAssetAmount.mul(price).div(numericConstants_1.BASE_PRECISION);
-        }
-        else {
-            return baseAssetAmount
-                .abs()
-                .mul(numericConstants_1.MAX_PREDICTION_PRICE.sub(price))
-                .div(numericConstants_1.BASE_PRECISION);
-        }
-    }
-    else {
-        return baseAssetAmount.abs().mul(price).div(numericConstants_1.BASE_PRECISION);
-    }
+function calculatePerpLiabilityValue(baseAssetAmount, price) {
+    return baseAssetAmount.abs().mul(price).div(numericConstants_1.BASE_PRECISION);
 }
 exports.calculatePerpLiabilityValue = calculatePerpLiabilityValue;
 /**
@@ -139,11 +130,11 @@ exports.calculatePerpLiabilityValue = calculatePerpLiabilityValue;
  * @param baseSize
  * @returns
  */
-function calculateMarginUSDCRequiredForTrade(driftClient, targetMarketIndex, baseSize, userMaxMarginRatio, userHighLeverageMode, entryPrice) {
+function calculateMarginUSDCRequiredForTrade(driftClient, targetMarketIndex, baseSize, userMaxMarginRatio, entryPrice) {
     const targetMarket = driftClient.getPerpMarketAccount(targetMarketIndex);
     const price = entryPrice !== null && entryPrice !== void 0 ? entryPrice : driftClient.getOracleDataForPerpMarket(targetMarket.marketIndex).price;
-    const perpLiabilityValue = calculatePerpLiabilityValue(baseSize, price, (0, types_1.isVariant)(targetMarket.contractType, 'prediction'));
-    const marginRequired = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(targetMarket, baseSize.abs(), 'Initial', userMaxMarginRatio, userHighLeverageMode))
+    const perpLiabilityValue = calculatePerpLiabilityValue(baseSize, price);
+    const marginRequired = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(targetMarket, baseSize.abs(), 'Initial', userMaxMarginRatio))
         .mul(perpLiabilityValue)
         .div(numericConstants_1.MARGIN_PRECISION);
     return marginRequired;
@@ -154,8 +145,8 @@ exports.calculateMarginUSDCRequiredForTrade = calculateMarginUSDCRequiredForTrad
  *
  * Returns collateral required in the precision of the target collateral market.
  */
-function calculateCollateralDepositRequiredForTrade(driftClient, targetMarketIndex, baseSize, collateralIndex, userMaxMarginRatio, userHighLeverageMode, estEntryPrice) {
-    const marginRequiredUsdc = calculateMarginUSDCRequiredForTrade(driftClient, targetMarketIndex, baseSize, userMaxMarginRatio, userHighLeverageMode, estEntryPrice);
+function calculateCollateralDepositRequiredForTrade(driftClient, targetMarketIndex, baseSize, collateralIndex, userMaxMarginRatio, estEntryPrice) {
+    const marginRequiredUsdc = calculateMarginUSDCRequiredForTrade(driftClient, targetMarketIndex, baseSize, userMaxMarginRatio, estEntryPrice);
     const collateralMarket = driftClient.getSpotMarketAccount(collateralIndex);
     const collateralOracleData = driftClient.getOracleDataForSpotMarket(collateralIndex);
     const scaledAssetWeight = (0, spotBalance_1.calculateScaledInitialAssetWeight)(collateralMarket, collateralOracleData.price);
@@ -212,25 +203,3 @@ 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.d.ts

@@ -27,7 +27,7 @@ export declare function calculateAskPrice(market: PerpMarketAccount, mmOraclePri
 export declare function calculateNewMarketAfterTrade(baseAssetAmount: BN, direction: PositionDirection, market: PerpMarketAccount): PerpMarketAccount;
 export declare function calculateOracleReserveSpread(market: PerpMarketAccount, mmOraclePriceData: MMOraclePriceData): BN;
 export declare function calculateOracleSpread(price: BN, oraclePriceData: OraclePriceData): BN;
-export declare function calculateMarketMarginRatio(market: PerpMarketAccount, size: BN, marginCategory: MarginCategory, customMarginRatio?: number, userHighLeverageMode?: boolean): number;
+export declare function calculateMarketMarginRatio(market: PerpMarketAccount, size: BN, marginCategory: MarginCategory, customMarginRatio?: number): number;
 export declare function calculateUnrealizedAssetWeight(market: PerpMarketAccount, quoteSpotMarket: SpotMarketAccount, unrealizedPnl: BN, marginCategory: MarginCategory, oraclePriceData: Pick<OraclePriceData, 'price'>): BN;
 export declare function calculateMarketAvailablePNL(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount): BN;
 export declare function calculateMarketMaxAvailableInsurance(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount): BN;
@@ -37,7 +37,7 @@ export declare function calculateAvailablePerpLiquidity(market: PerpMarketAccoun
     bids: BN;
     asks: BN;
 };
-export declare function calculatePerpMarketBaseLiquidatorFee(market: PerpMarketAccount, userHighLeverageMode: boolean): number;
+export declare function calculatePerpMarketBaseLiquidatorFee(market: PerpMarketAccount): 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

package/lib/browser/math/market.js

@@ -26,7 +26,7 @@ exports.calculateReservePrice = calculateReservePrice;
  * @return bidPrice : Precision PRICE_PRECISION
  */
 function calculateBidPrice(market, mmOraclePriceData, latestSlot) {
-    const { baseAssetReserve, quoteAssetReserve, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, types_1.PositionDirection.SHORT, mmOraclePriceData, undefined, latestSlot);
+    const { baseAssetReserve, quoteAssetReserve, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, types_1.PositionDirection.SHORT, mmOraclePriceData, latestSlot);
     return (0, amm_1.calculatePrice)(baseAssetReserve, quoteAssetReserve, newPeg);
 }
 exports.calculateBidPrice = calculateBidPrice;
@@ -37,7 +37,7 @@ exports.calculateBidPrice = calculateBidPrice;
  * @return askPrice : Precision PRICE_PRECISION
  */
 function calculateAskPrice(market, mmOraclePriceData, latestSlot) {
-    const { baseAssetReserve, quoteAssetReserve, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, types_1.PositionDirection.LONG, mmOraclePriceData, undefined, latestSlot);
+    const { baseAssetReserve, quoteAssetReserve, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, types_1.PositionDirection.LONG, mmOraclePriceData, latestSlot);
     return (0, amm_1.calculatePrice)(baseAssetReserve, quoteAssetReserve, newPeg);
 }
 exports.calculateAskPrice = calculateAskPrice;
@@ -60,48 +60,23 @@ function calculateOracleSpread(price, oraclePriceData) {
     return price.sub(oraclePriceData.price);
 }
 exports.calculateOracleSpread = calculateOracleSpread;
-function calculateMarketMarginRatio(market, size, marginCategory, customMarginRatio = 0, userHighLeverageMode = false) {
+function calculateMarketMarginRatio(market, size, marginCategory, customMarginRatio = 0) {
     if (market.status === 'Settlement')
         return 0;
-    const isHighLeverageUser = userHighLeverageMode &&
-        market.highLeverageMarginRatioInitial > 0 &&
-        market.highLeverageMarginRatioMaintenance > 0;
-    const marginRatioInitial = isHighLeverageUser
-        ? market.highLeverageMarginRatioInitial
-        : market.marginRatioInitial;
-    const marginRatioMaintenance = isHighLeverageUser
-        ? market.highLeverageMarginRatioMaintenance
-        : market.marginRatioMaintenance;
     let defaultMarginRatio;
     switch (marginCategory) {
         case 'Initial':
-            defaultMarginRatio = marginRatioInitial;
+            defaultMarginRatio = market.marginRatioInitial;
             break;
         case 'Maintenance':
-            defaultMarginRatio = marginRatioMaintenance;
+            defaultMarginRatio = market.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);
-    }
+    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);
     }
@@ -181,15 +156,8 @@ function calculateAvailablePerpLiquidity(market, mmOraclePriceData, dlob, slot)
     };
 }
 exports.calculateAvailablePerpLiquidity = calculateAvailablePerpLiquidity;
-function calculatePerpMarketBaseLiquidatorFee(market, userHighLeverageMode) {
-    if (userHighLeverageMode && market.highLeverageMarginRatioMaintenance > 0) {
-        const marginRatio = market.highLeverageMarginRatioMaintenance * 100;
-        // min(liquidator_fee, .8 * high_leverage_margin_ratio_maintenance)
-        return Math.min(market.liquidatorFee, marginRatio - Math.floor(marginRatio / 5));
-    }
-    else {
-        return market.liquidatorFee;
-    }
+function calculatePerpMarketBaseLiquidatorFee(market) {
+    return market.liquidatorFee;
 }
 exports.calculatePerpMarketBaseLiquidatorFee = calculatePerpMarketBaseLiquidatorFee;
 /**
@@ -233,7 +201,7 @@ function getLastFundingBasis(market, oraclePrice, now) {
             .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 lastFundingRatePreAdj = lastFundingRate.sub(numericConstants_1.FUNDING_RATE_PRECISION.div(new anchor_1.BN(3333)) // 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

package/lib/browser/math/oracles.js

@@ -56,10 +56,7 @@ function getOracleValidity(market, oraclePriceData, oracleGuardRails, slot, orac
         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',
-    ])) {
+    if ((0, types_1.isVariant)(market.amm.oracleSource, 'pythLazerStableCoin')) {
         isStaleForMargin = oracleDelay.gt(new anchor_1.BN(oracleGuardRails.validity.slotsBeforeStaleForMargin).muln(3));
     }
     if (isNonPositive) {
@@ -183,21 +180,19 @@ function trimVaaSignatures(vaa, n = 3) {
 }
 exports.trimVaaSignatures = trimVaaSignatures;
 function getMultipleBetweenOracleSources(firstOracleSource, secondOracleSource) {
-    if ((0, types_1.isVariant)(firstOracleSource, 'pythPull') &&
-        (0, types_1.isVariant)(secondOracleSource, 'pyth1MPull')) {
-        return { numerator: new anchor_1.BN(1000000), denominator: new anchor_1.BN(1) };
-    }
-    if ((0, types_1.isVariant)(firstOracleSource, 'pythPull') &&
-        (0, types_1.isVariant)(secondOracleSource, 'pyth1KPull')) {
-        return { numerator: new anchor_1.BN(1000), denominator: new anchor_1.BN(1) };
-    }
-    if ((0, types_1.isVariant)(firstOracleSource, 'pyth1MPull') &&
-        (0, types_1.isVariant)(secondOracleSource, 'pythPull')) {
-        return { numerator: new anchor_1.BN(1), denominator: new anchor_1.BN(1000000) };
-    }
-    if ((0, types_1.isVariant)(firstOracleSource, 'pyth1KPull') &&
-        (0, types_1.isVariant)(secondOracleSource, 'pythPull')) {
-        return { numerator: new anchor_1.BN(1), denominator: new anchor_1.BN(1000) };
+    if ((0, types_1.isOneOfVariant)(firstOracleSource, [
+        'pythPull',
+        'pyth1KPull',
+        'pyth1MPull',
+        'pythStableCoinPull',
+    ]) ||
+        (0, types_1.isOneOfVariant)(secondOracleSource, [
+            'pythPull',
+            'pyth1KPull',
+            'pyth1MPull',
+            'pythStableCoinPull',
+        ])) {
+        throw new Error('Pyth pull oracle support has been removed from the SDK');
     }
     if ((0, types_1.isVariant)(firstOracleSource, 'pythLazer') &&
         (0, types_1.isVariant)(secondOracleSource, 'pythLazer1M')) {

package/lib/browser/math/position.js

@@ -23,7 +23,7 @@ function calculateBaseAssetValue(market, userPosition, mmOraclePriceData, useSpr
     let prepegAmm;
     if (!skipUpdate) {
         if (market.amm.baseSpread > 0 && useSpread) {
-            const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, directionToClose, mmOraclePriceData, undefined, latestSlot);
+            const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, directionToClose, mmOraclePriceData, latestSlot);
             prepegAmm = {
                 baseAssetReserve,
                 quoteAssetReserve,

package/lib/browser/math/trade.js

@@ -53,7 +53,7 @@ function calculateTradeSlippage(direction, amount, market, inputAssetType = 'quo
         .div(acquiredBaseReserve.abs());
     let amm;
     if (useSpread && market.amm.baseSpread > 0) {
-        const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, undefined, latestSlot);
+        const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, latestSlot);
         amm = {
             baseAssetReserve,
             quoteAssetReserve,
@@ -102,7 +102,7 @@ function calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType
     const swapDirection = (0, amm_1.getSwapDirection)(inputAssetType, direction);
     let amm;
     if (useSpread && market.amm.baseSpread > 0) {
-        const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, undefined, latestSlot);
+        const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, latestSlot);
         amm = {
             baseAssetReserve,
             quoteAssetReserve,
@@ -166,7 +166,7 @@ function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAsse
     let quoteAssetReserveBefore;
     let peg = market.amm.pegMultiplier;
     if (useSpread && market.amm.baseSpread > 0) {
-        const { baseAssetReserve, quoteAssetReserve, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, undefined, latestSlot);
+        const { baseAssetReserve, quoteAssetReserve, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, latestSlot);
         baseAssetReserveBefore = baseAssetReserve;
         quoteAssetReserveBefore = quoteAssetReserve;
         peg = newPeg;
@@ -280,7 +280,7 @@ function calculateEstimatedPerpEntryPrice(assetType, amount, direction, market,
     const takerIsLong = (0, types_2.isVariant)(direction, 'long');
     const limitOrders = dlob[takerIsLong ? 'getRestingLimitAsks' : 'getRestingLimitBids'](market.marketIndex, slot, types_1.MarketType.PERP, mmOraclePriceData);
     const swapDirection = (0, amm_1.getSwapDirection)(assetType, direction);
-    const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, undefined, new anchor_1.BN(slot));
+    const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, direction, mmOraclePriceData, new anchor_1.BN(slot));
     const amm = {
         baseAssetReserve,
         quoteAssetReserve,