@drift-labs/sdk 2.149.1 → 2.150.0-alpha.0

package/lib/browser/idl/drift.json

@@ -652,6 +652,163 @@
                 }
             ]
         },
+        {
+            "name": "depositIntoIsolatedPerpPosition",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "spotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "spotMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "perpMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "amount",
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "transferIsolatedPerpPositionDeposit",
+            "accounts": [
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "spotMarketVault",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "spotMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "perpMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "amount",
+                    "type": "i64"
+                }
+            ]
+        },
+        {
+            "name": "withdrawFromIsolatedPerpPosition",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "spotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "driftSigner",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "userTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "spotMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "perpMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "amount",
+                    "type": "u64"
+                }
+            ]
+        },
         {
             "name": "placePerpOrder",
             "accounts": [
@@ -14412,13 +14569,13 @@
                         "type": "u64"
                     },
                     {
-                        "name": "lastBaseAssetAmountPerLp",
+                        "name": "isolatedPositionScaledBalance",
                         "docs": [
                             "The last base asset amount per lp the amm had",
                             "Used to settle the users lp position",
-                            "precision: BASE_PRECISION"
+                            "precision: SPOT_BALANCE_PRECISION"
                         ],
-                        "type": "i64"
+                        "type": "u64"
                     },
                     {
                         "name": "lastQuoteAssetAmountPerLp",
@@ -14457,8 +14614,8 @@
                         "type": "u8"
                     },
                     {
-                        "name": "perLpBase",
-                        "type": "i8"
+                        "name": "positionFlag",
+                        "type": "u8"
                     }
                 ]
             }
@@ -15138,6 +15295,17 @@
                 ]
             }
         },
+        {
+            "name": "LiquidationBitFlag",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "IsolatedPosition"
+                    }
+                ]
+            }
+        },
         {
             "name": "SettlePnlExplanation",
             "type": {
@@ -15267,13 +15435,7 @@
                 "kind": "enum",
                 "variants": [
                     {
-                        "name": "Standard",
-                        "fields": [
-                            {
-                                "name": "trackOpenOrdersFraction",
-                                "type": "bool"
-                            }
-                        ]
+                        "name": "Standard"
                     },
                     {
                         "name": "Liquidation",
@@ -15434,6 +15596,9 @@
                     },
                     {
                         "name": "AmmImmediateFill"
+                    },
+                    {
+                        "name": "SettleRevPool"
                     }
                 ]
             }
@@ -15912,6 +16077,23 @@
                 ]
             }
         },
+        {
+            "name": "PositionFlag",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "IsolatedPosition"
+                    },
+                    {
+                        "name": "BeingLiquidated"
+                    },
+                    {
+                        "name": "Bankrupt"
+                    }
+                ]
+            }
+        },
         {
             "name": "ReferrerStatus",
             "type": {
@@ -16131,6 +16313,18 @@
                         "option": "publicKey"
                     },
                     "index": false
+                },
+                {
+                    "name": "signer",
+                    "type": {
+                        "option": "publicKey"
+                    },
+                    "index": false
+                },
+                {
+                    "name": "userTokenAmountAfter",
+                    "type": "i128",
+                    "index": false
                 }
             ]
         },
@@ -16876,6 +17070,11 @@
                         "defined": "SpotBankruptcyRecord"
                     },
                     "index": false
+                },
+                {
+                    "name": "bitFlags",
+                    "type": "u8",
+                    "index": false
                 }
             ]
         },
@@ -18312,8 +18511,8 @@
         },
         {
             "code": 6094,
-            "name": "CantUpdatePoolBalanceType",
-            "msg": "CantUpdatePoolBalanceType"
+            "name": "CantUpdateSpotBalanceType",
+            "msg": "CantUpdateSpotBalanceType"
         },
         {
             "code": 6095,
@@ -19427,41 +19626,46 @@
         },
         {
             "code": 6317,
+            "name": "InvalidIsolatedPerpMarket",
+            "msg": "Invalid Isolated Perp Market"
+        },
+        {
+            "code": 6318,
             "name": "InvalidRevenueShareResize",
             "msg": "Invalid RevenueShare resize"
         },
         {
-            "code": 6318,
+            "code": 6319,
             "name": "BuilderRevoked",
             "msg": "Builder has been revoked"
         },
         {
-            "code": 6319,
+            "code": 6320,
             "name": "InvalidBuilderFee",
             "msg": "Builder fee is greater than max fee bps"
         },
         {
-            "code": 6320,
+            "code": 6321,
             "name": "RevenueShareEscrowAuthorityMismatch",
             "msg": "RevenueShareEscrow authority mismatch"
         },
         {
-            "code": 6321,
+            "code": 6322,
             "name": "RevenueShareEscrowOrdersAccountFull",
             "msg": "RevenueShareEscrow has too many active orders"
         },
         {
-            "code": 6322,
+            "code": 6323,
             "name": "InvalidRevenueShareAccount",
             "msg": "Invalid RevenueShareAccount"
         },
         {
-            "code": 6323,
+            "code": 6324,
             "name": "CannotRevokeBuilderWithOpenOrders",
             "msg": "Cannot revoke builder with open orders"
         },
         {
-            "code": 6324,
+            "code": 6325,
             "name": "UnableToLoadRevenueShareAccount",
             "msg": "Unable to load builder account"
         },

package/lib/browser/math/margin.js

@@ -91,10 +91,11 @@ 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, (0, types_1.isVariant)(perpMarket.contractType, 'prediction')),
         };
     }
     const allBids = perpPosition.baseAssetAmount.add(perpPosition.openBids);

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

@@ -46,6 +46,7 @@ export declare function calculateUnsettledFundingPnl(market: PerpMarketAccount,
  */
 export declare function calculatePositionFundingPNL(market: PerpMarketAccount, perpPosition: PerpPosition): BN;
 export declare function positionIsAvailable(position: PerpPosition): boolean;
+export declare function positionIsBeingLiquidated(position: PerpPosition): boolean;
 /**
  *
  * @param userPosition

package/lib/browser/math/position.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasOpenOrders = exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateCostBasis = exports.calculateEntryPrice = exports.calculateBreakEvenPrice = exports.positionIsAvailable = exports.calculatePositionFundingPNL = exports.calculateUnsettledFundingPnl = exports.calculateFeesAndFundingPnl = exports.calculateClaimablePnl = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
+exports.hasOpenOrders = exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateCostBasis = exports.calculateEntryPrice = exports.calculateBreakEvenPrice = exports.positionIsBeingLiquidated = exports.positionIsAvailable = exports.calculatePositionFundingPNL = exports.calculateUnsettledFundingPnl = exports.calculateFeesAndFundingPnl = exports.calculateClaimablePnl = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
@@ -149,9 +149,17 @@ function positionIsAvailable(position) {
     return (position.baseAssetAmount.eq(numericConstants_1.ZERO) &&
         position.openOrders === 0 &&
         position.quoteAssetAmount.eq(numericConstants_1.ZERO) &&
-        position.lpShares.eq(numericConstants_1.ZERO));
+        position.lpShares.eq(numericConstants_1.ZERO) &&
+        position.isolatedPositionScaledBalance.eq(numericConstants_1.ZERO) &&
+        !positionIsBeingLiquidated(position));
 }
 exports.positionIsAvailable = positionIsAvailable;
+function positionIsBeingLiquidated(position) {
+    return ((position.positionFlag &
+        (types_1.PositionFlag.BeingLiquidated | types_1.PositionFlag.Bankruptcy)) >
+        0);
+}
+exports.positionIsBeingLiquidated = positionIsBeingLiquidated;
 /**
  *
  * @param userPosition

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

@@ -5,6 +5,7 @@ import { DriftClient } from '../driftClient';
 import { BN } from '@coral-xyz/anchor';
 import { User } from '../user';
 import { DepositRecord } from '../types';
+import fetch from 'node-fetch';
 export type BSOL_STATS_API_RESPONSE = {
     success: boolean;
     stats?: {
@@ -27,8 +28,8 @@ export type BSOL_EMISSIONS_API_RESPONSE = {
         lend: number;
     };
 };
-export declare function fetchBSolMetrics(): Promise<any>;
-export declare function fetchBSolDriftEmissions(): Promise<any>;
+export declare function fetchBSolMetrics(): Promise<fetch.Response>;
+export declare function fetchBSolDriftEmissions(): Promise<fetch.Response>;
 export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }: {
     marketIndex: number;
     amount: BN;

package/lib/browser/types.d.ts

@@ -697,6 +697,9 @@ export type SpotBankruptcyRecord = {
     cumulativeDepositInterestDelta: BN;
     ifPayment: BN;
 };
+export declare class LiquidationBitFlag {
+    static readonly IsolatedPosition = 1;
+}
 export type SettlePnlRecord = {
     ts: BN;
     user: PublicKey;
@@ -1192,14 +1195,9 @@ export type PerpPosition = {
     lastBaseAssetAmountPerLp: BN;
     lastQuoteAssetAmountPerLp: BN;
     perLpBase: number;
-    isolatedPositionScaledBalance: BN;
     positionFlag: number;
+    isolatedPositionScaledBalance: BN;
 };
-export declare class PositionFlag {
-    static readonly IsolatedPosition = 1;
-    static readonly BeingLiquidated = 2;
-    static readonly Bankruptcy = 4;
-}
 export type UserStatsAccount = {
     numberOfSubAccounts: number;
     numberOfSubAccountsCreated: number;
@@ -1348,6 +1346,11 @@ export declare class OrderParamsBitFlag {
     static readonly ImmediateOrCancel = 1;
     static readonly UpdateHighLeverageMode = 2;
 }
+export declare class PositionFlag {
+    static readonly IsolatedPosition = 1;
+    static readonly BeingLiquidated = 2;
+    static readonly Bankruptcy = 4;
+}
 export type NecessaryOrderParams = {
     orderType: OrderType;
     marketIndex: number;
@@ -1357,6 +1360,9 @@ export type NecessaryOrderParams = {
 export type OptionalOrderParams = {
     [Property in keyof OrderParams]?: OrderParams[Property];
 } & NecessaryOrderParams;
+export type PerpOrderIsolatedExtras = {
+    isolatedPositionDepositAmount?: BN;
+};
 export type ModifyOrderParams = {
     [Property in keyof OrderParams]?: OrderParams[Property] | null;
 } & {

package/lib/browser/types.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConstituentLpOperation = exports.ConstituentStatus = exports.OracleValidity = exports.SwapReduceOnly = exports.PlaceAndTakeOrderSuccessCondition = exports.FuelOverflowStatus = exports.ReferrerStatus = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.OrderParamsBitFlag = exports.PostOnlyParams = exports.PositionFlag = 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.ConstituentStatus = exports.OracleValidity = exports.SwapReduceOnly = exports.PlaceAndTakeOrderSuccessCondition = exports.FuelOverflowStatus = exports.ReferrerStatus = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.PositionFlag = exports.OrderParamsBitFlag = exports.PostOnlyParams = exports.LiquidationBitFlag = 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.ConstituentLpOperation = void 0;
 const numericConstants_1 = require("./constants/numericConstants");
 // # Utility Types / Enums / Constants
 var ExchangeStatus;
@@ -353,12 +354,10 @@ LiquidationType.SPOT_BANKRUPTCY = {
 LiquidationType.LIQUIDATE_SPOT = {
     liquidateSpot: {},
 };
-class PositionFlag {
+class LiquidationBitFlag {
 }
-exports.PositionFlag = PositionFlag;
-PositionFlag.IsolatedPosition = 1;
-PositionFlag.BeingLiquidated = 2;
-PositionFlag.Bankruptcy = 4;
+exports.LiquidationBitFlag = LiquidationBitFlag;
+LiquidationBitFlag.IsolatedPosition = 1;
 class PostOnlyParams {
 }
 exports.PostOnlyParams = PostOnlyParams;
@@ -371,6 +370,12 @@ class OrderParamsBitFlag {
 exports.OrderParamsBitFlag = OrderParamsBitFlag;
 OrderParamsBitFlag.ImmediateOrCancel = 1;
 OrderParamsBitFlag.UpdateHighLeverageMode = 2;
+class PositionFlag {
+}
+exports.PositionFlag = PositionFlag;
+PositionFlag.IsolatedPosition = 1;
+PositionFlag.BeingLiquidated = 2;
+PositionFlag.Bankruptcy = 4;
 var ModifyOrderPolicy;
 (function (ModifyOrderPolicy) {
     ModifyOrderPolicy[ModifyOrderPolicy["MustModify"] = 1] = "MustModify";

package/lib/browser/user.d.ts

@@ -62,6 +62,7 @@ export declare class User {
      */
     getTokenAmount(marketIndex: number): BN;
     getEmptyPosition(marketIndex: number): PerpPosition;
+    isPositionEmpty(position: PerpPosition): boolean;
     getIsolatePerpPositionTokenAmount(perpMarketIndex: number): BN;
     getClonedPosition(position: PerpPosition): PerpPosition;
     getOrderForUserAccount(userAccount: UserAccount, orderId: number): Order | undefined;
@@ -93,7 +94,7 @@ export declare class User {
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
      */
-    getPerpBuyingPower(marketIndex: number, collateralBuffer?: BN, enterHighLeverageMode?: any, maxMarginRatio?: any): BN;
+    getPerpBuyingPower(marketIndex: number, collateralBuffer?: BN, enterHighLeverageMode?: any, maxMarginRatio?: any, positionType?: 'isolated' | 'cross'): BN;
     getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex: number, freeCollateral: BN, baseAssetAmount: BN, enterHighLeverageMode?: any, perpMarketMaxMarginRatio?: any): BN;
     /**
      * calculates Free Collateral = Total collateral - margin requirement
@@ -311,7 +312,7 @@ export declare class User {
      * @param isLp
      * @returns { tradeSize: BN, oppositeSideTradeSize: BN} : Precision QUOTE_PRECISION
      */
-    getMaxTradeSizeUSDCForPerp(targetMarketIndex: number, tradeSide: PositionDirection, isLp?: boolean, enterHighLeverageMode?: any, maxMarginRatio?: any): {
+    getMaxTradeSizeUSDCForPerp(targetMarketIndex: number, tradeSide: PositionDirection, isLp?: boolean, enterHighLeverageMode?: any, maxMarginRatio?: any, positionType?: 'isolated' | 'cross'): {
         tradeSize: BN;
         oppositeSideTradeSize: BN;
     };

package/lib/browser/user.js

@@ -86,6 +86,7 @@ class User {
         await this.accountSubscriber.fetch();
     }
     async unsubscribe() {
+        this.eventEmitter.removeAllListeners();
         await this.accountSubscriber.unsubscribe();
         this.isSubscribed = false;
     }
@@ -191,6 +192,9 @@ class User {
             positionFlag: 0,
         };
     }
+    isPositionEmpty(position) {
+        return position.baseAssetAmount.eq(numericConstants_1.ZERO) && position.openOrders === 0;
+    }
     getIsolatePerpPositionTokenAmount(perpMarketIndex) {
         var _a;
         const perpPosition = this.getPerpPosition(perpMarketIndex);
@@ -283,14 +287,21 @@ class User {
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
      */
-    getPerpBuyingPower(marketIndex, collateralBuffer = numericConstants_1.ZERO, enterHighLeverageMode = undefined, maxMarginRatio = undefined) {
+    getPerpBuyingPower(marketIndex, collateralBuffer = numericConstants_1.ZERO, enterHighLeverageMode = undefined, maxMarginRatio = undefined, positionType = 'cross') {
         const perpPosition = this.getPerpPositionOrEmpty(marketIndex);
         const perpMarket = this.driftClient.getPerpMarketAccount(marketIndex);
         const oraclePriceData = this.getOracleDataForPerpMarket(marketIndex);
         const worstCaseBaseAssetAmount = perpPosition
             ? (0, margin_2.calculateWorstCaseBaseAssetAmount)(perpPosition, perpMarket, oraclePriceData.price)
             : numericConstants_1.ZERO;
-        const freeCollateral = this.getFreeCollateral('Initial', enterHighLeverageMode).sub(collateralBuffer);
+        let freeCollateral = numericConstants_1.ZERO;
+        // if position is isolated, we always add on available quote from the cross account
+        if (positionType === 'isolated') {
+            const { totalAssetValue: quoteSpotMarketAssetValue, totalLiabilityValue: quoteSpotMarketLiabilityValue, } = this.getSpotMarketAssetAndLiabilityValue(perpMarket.quoteSpotMarketIndex, 'Initial', undefined, undefined, true);
+            freeCollateral = quoteSpotMarketAssetValue.sub(quoteSpotMarketLiabilityValue);
+        }
+        // adding free collateral from the cross account or from within isolated margin calc for this marketIndex
+        freeCollateral = freeCollateral.add(this.getFreeCollateral('Initial', enterHighLeverageMode, positionType === 'isolated' ? marketIndex : undefined).sub(collateralBuffer));
         return this.getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, worstCaseBaseAssetAmount, enterHighLeverageMode, maxMarginRatio || perpPosition.maxMarginRatio);
     }
     getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, baseAssetAmount, enterHighLeverageMode = undefined, perpMarketMaxMarginRatio = undefined) {
@@ -303,16 +314,21 @@ class User {
      * @returns : Precision QUOTE_PRECISION
      */
     getFreeCollateral(marginCategory = 'Initial', enterHighLeverageMode = false, perpMarketIndex) {
-        const { totalCollateral, marginRequirement, getIsolatedFreeCollateral } = this.getMarginCalculation(marginCategory, {
+        const calc = this.getMarginCalculation(marginCategory, {
             enteringHighLeverage: enterHighLeverageMode,
             strict: marginCategory === 'Initial',
         });
         if (perpMarketIndex !== undefined) {
-            return getIsolatedFreeCollateral(perpMarketIndex);
+            // getIsolatedFreeCollateral will throw if no existing isolated position but we are fetching for potential new position, so we wrap in a try/catch
+            try {
+                return calc.getIsolatedFreeCollateral(perpMarketIndex);
+            }
+            catch (error) {
+                return numericConstants_1.ZERO;
+            }
         }
         else {
-            const freeCollateral = totalCollateral.sub(marginRequirement);
-            return freeCollateral.gte(numericConstants_1.ZERO) ? freeCollateral : numericConstants_1.ZERO;
+            return calc.getCrossFreeCollateral();
         }
     }
     getMarginRequirement(marginCategory, liquidationBuffer, strict, includeOpenOrders, enteringHighLeverage, perpMarketIndex) {
@@ -1407,7 +1423,7 @@ class User {
      * @param isLp
      * @returns { tradeSize: BN, oppositeSideTradeSize: BN} : Precision QUOTE_PRECISION
      */
-    getMaxTradeSizeUSDCForPerp(targetMarketIndex, tradeSide, isLp = false, enterHighLeverageMode = undefined, maxMarginRatio = undefined) {
+    getMaxTradeSizeUSDCForPerp(targetMarketIndex, tradeSide, isLp = false, enterHighLeverageMode = undefined, maxMarginRatio = undefined, positionType = 'cross') {
         let tradeSize = numericConstants_1.ZERO;
         let oppositeSideTradeSize = numericConstants_1.ZERO;
         const currentPosition = this.getPerpPositionOrEmpty(targetMarketIndex);
@@ -1429,7 +1445,7 @@ class User {
         const oppositeSizeLiabilityValue = targetingSameSide
             ? numericConstants_1.ZERO
             : (0, margin_1.calculatePerpLiabilityValue)(currentPosition.baseAssetAmount, oracleData.price, (0, types_1.isVariant)(marketAccount.contractType, 'prediction'));
-        const maxPositionSize = this.getPerpBuyingPower(targetMarketIndex, lpBuffer, enterHighLeverageMode, maxMarginRatio);
+        const maxPositionSize = this.getPerpBuyingPower(targetMarketIndex, lpBuffer, enterHighLeverageMode, maxMarginRatio, positionType);
         if (maxPositionSize.gte(numericConstants_1.ZERO)) {
             if (oppositeSizeLiabilityValue.eq(numericConstants_1.ZERO)) {
                 // case 1 : Regular trade where current total position less than max, and no opposite position to account for

package/lib/node/constants/perpMarkets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"perpMarkets.d.ts","sourceRoot":"","sources":["../../../src/constants/perpMarkets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,MAAM,MAAM,gBAAgB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,gBAAgB,EA6W/C,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EAqhChD,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE;KAAG,GAAG,IAAI,QAAQ,GAAG,gBAAgB,EAAE;CAGhE,CAAC"}
+{"version":3,"file":"perpMarkets.d.ts","sourceRoot":"","sources":["../../../src/constants/perpMarkets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,MAAM,MAAM,gBAAgB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,gBAAgB,EA6W/C,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EAgiChD,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE;KAAG,GAAG,IAAI,QAAQ,GAAG,gBAAgB,EAAE;CAGhE,CAAC"}

package/lib/node/constants/perpMarkets.js

@@ -1327,6 +1327,17 @@ exports.MainnetPerpMarkets = [
         oracleSource: types_1.OracleSource.PYTH_LAZER,
         pythLazerId: 2382,
     },
+    {
+        fullName: 'Monad',
+        category: ['L1'],
+        symbol: '1KMON-PERP',
+        baseAssetSymbol: '1KMON',
+        marketIndex: 83,
+        oracle: new web3_js_1.PublicKey('585jsthKg9BeTfnFGAxgfNie9krGGyPbd5feMpWneHf7'),
+        launchTs: 1763996757000,
+        oracleSource: types_1.OracleSource.PYTH_LAZER_1K,
+        pythLazerId: 2396,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/node/constants/spotMarkets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spotMarkets.d.ts","sourceRoot":"","sources":["../../../src/constants/spotMarkets.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAW5C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,MAAM,gBAAgB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,EAAE,CAAC;IACd,YAAY,EAAE,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,cAAc,CAAC,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAE5B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,gBAAgB,EAuH/C,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EAo0BhD,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE;KAAG,GAAG,IAAI,QAAQ,GAAG,gBAAgB,EAAE;CAGhE,CAAC"}
+{"version":3,"file":"spotMarkets.d.ts","sourceRoot":"","sources":["../../../src/constants/spotMarkets.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAW5C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,MAAM,gBAAgB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,EAAE,CAAC;IACd,YAAY,EAAE,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,cAAc,CAAC,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAE5B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,gBAAgB,EAuH/C,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EAk1BhD,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE;KAAG,GAAG,IAAI,QAAQ,GAAG,gBAAgB,EAAE;CAGhE,CAAC"}