@velocity-exchange/sdk 0.0.5 → 0.2.0

package/lib/browser/user.js

@@ -4,13 +4,14 @@ exports.User = void 0;
 const types_1 = require("./types");
 const position_1 = require("./math/position");
 const numericConstants_1 = require("./constants/numericConstants");
+const utils_1 = require("./accounts/utils");
 const bigNum_1 = require("./factory/bigNum");
 const anchor_1 = require("./isomorphic/anchor");
 const position_2 = require("./math/position");
 const market_1 = require("./math/market");
 const margin_1 = require("./math/margin");
 const spotMarket_1 = require("./math/spotMarket");
-const utils_1 = require("./math/utils");
+const utils_2 = require("./math/utils");
 const spotBalance_1 = require("./math/spotBalance");
 const trade_1 = require("./math/trade");
 const types_2 = require("./types");
@@ -27,10 +28,6 @@ const strictOraclePrice_1 = require("./oracles/strictOraclePrice");
 const grpcUserAccountSubscriber_1 = require("./accounts/grpcUserAccountSubscriber");
 const marginCalculation_1 = require("./marginCalculation");
 class User {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;
     }
@@ -38,40 +35,40 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         this._isSubscribed = false;
         // Type-system guarantees at least one of the two is supplied.
-        const velocityClient = ((_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient);
+        const velocityClient = config.velocityClient;
         this.velocityClient = velocityClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
-        if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'polling') {
+        if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
             this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(velocityClient.connection, config.userAccountPublicKey, config.accountSubscription.accountLoader, this.velocityClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.velocityClient.program.account.user.coder.accounts));
         }
-        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'custom') {
+        else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
             this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
         }
-        else if (((_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.type) === 'grpc') {
+        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'grpc') {
             if (config.accountSubscription.grpcMultiUserAccountSubscriber) {
                 this.accountSubscriber =
                     config.accountSubscription.grpcMultiUserAccountSubscriber.forUser(config.userAccountPublicKey);
             }
             else {
                 this.accountSubscriber = new grpcUserAccountSubscriber_1.grpcUserAccountSubscriber(config.accountSubscription.grpcConfigs, velocityClient.program, config.userAccountPublicKey, {
-                    resubTimeoutMs: (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.resubTimeoutMs,
-                    logResubMessages: (_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.logResubMessages,
+                    resubTimeoutMs: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.resubTimeoutMs,
+                    logResubMessages: (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.logResubMessages,
                 });
             }
         }
         else {
-            if (((_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.type) === 'websocket' &&
-                ((_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.programUserAccountSubscriber)) {
+            if (((_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.type) === 'websocket' &&
+                ((_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.programUserAccountSubscriber)) {
                 this.accountSubscriber = new websocketProgramUserAccountSubscriber_1.WebSocketProgramUserAccountSubscriber(velocityClient.program, config.userAccountPublicKey, config.accountSubscription.programUserAccountSubscriber);
             }
             else {
                 this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(velocityClient.program, config.userAccountPublicKey, {
-                    resubTimeoutMs: (_j = config.accountSubscription) === null || _j === void 0 ? void 0 : _j.resubTimeoutMs,
-                    logResubMessages: (_k = config.accountSubscription) === null || _k === void 0 ? void 0 : _k.logResubMessages,
-                }, (_l = config.accountSubscription) === null || _l === void 0 ? void 0 : _l.commitment);
+                    resubTimeoutMs: (_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.resubTimeoutMs,
+                    logResubMessages: (_j = config.accountSubscription) === null || _j === void 0 ? void 0 : _j.logResubMessages,
+                }, (_k = config.accountSubscription) === null || _k === void 0 ? void 0 : _k.commitment);
             }
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
@@ -96,15 +93,37 @@ class User {
         this.isSubscribed = false;
     }
     getUserAccount() {
-        return this.accountSubscriber.getUserAccountAndSlot().data;
+        var _a;
+        return (_a = this.accountSubscriber.getUserAccountAndSlot()) === null || _a === void 0 ? void 0 : _a.data;
+    }
+    /**
+     * Like {@link getUserAccount} but throws a named error instead of returning
+     * `undefined` when the account has not been loaded yet. Use at call sites
+     * that structurally require a loaded account.
+     */
+    getUserAccountOrThrow() {
+        const userAccount = this.getUserAccount();
+        if (!userAccount) {
+            throw new Error(`User account not loaded: ${this.getUserAccountPublicKey().toString()}`);
+        }
+        return userAccount;
     }
     async forceGetUserAccount() {
         await this.fetchAccounts();
-        return this.accountSubscriber.getUserAccountAndSlot().data;
+        const account = this.accountSubscriber.getUserAccountAndSlot();
+        return account === null || account === void 0 ? void 0 : account.data;
     }
     getUserAccountAndSlot() {
         return this.accountSubscriber.getUserAccountAndSlot();
     }
+    /**
+     * Like {@link getUserAccountAndSlot} but throws a named error instead of
+     * returning `undefined` when the account has not been loaded yet. Use at
+     * call sites that structurally require a loaded account.
+     */
+    getUserAccountAndSlotOrThrow() {
+        return (0, utils_1.assertDataAndSlot)(this.accountSubscriber.getUserAccountAndSlot(), `User account not loaded: ${this.getUserAccountPublicKey().toString()}`);
+    }
     getPerpPositionForUserAccount(userAccount, marketIndex) {
         return this.getActivePerpPositionsForUserAccount(userAccount).find((position) => position.marketIndex === marketIndex);
     }
@@ -114,16 +133,23 @@ class User {
      * @returns userPerpPosition
      */
     getPerpPosition(marketIndex) {
-        const userAccount = this.getUserAccount();
+        const userAccount = this.getUserAccountOrThrow();
         return this.getPerpPositionForUserAccount(userAccount, marketIndex);
     }
     getPerpPositionOrEmpty(marketIndex) {
         var _a;
-        const userAccount = this.getUserAccount();
+        const userAccount = this.getUserAccountOrThrow();
         return ((_a = this.getPerpPositionForUserAccount(userAccount, marketIndex)) !== null && _a !== void 0 ? _a : this.getEmptyPosition(marketIndex));
     }
+    getPerpPositionOrThrow(marketIndex) {
+        const position = this.getPerpPosition(marketIndex);
+        if (!position) {
+            throw new Error(`No perp position found for market ${marketIndex}`);
+        }
+        return position;
+    }
     getPerpPositionAndSlot(marketIndex) {
-        const userAccount = this.getUserAccountAndSlot();
+        const userAccount = this.getUserAccountAndSlotOrThrow();
         const perpPosition = this.getPerpPositionForUserAccount(userAccount.data, marketIndex);
         return {
             data: perpPosition,
@@ -139,11 +165,11 @@ class User {
      * @returns userSpotPosition
      */
     getSpotPosition(marketIndex) {
-        const userAccount = this.getUserAccount();
+        const userAccount = this.getUserAccountOrThrow();
         return this.getSpotPositionForUserAccount(userAccount, marketIndex);
     }
     getSpotPositionAndSlot(marketIndex) {
-        const userAccount = this.getUserAccountAndSlot();
+        const userAccount = this.getUserAccountAndSlotOrThrow();
         const spotPosition = this.getSpotPositionForUserAccount(userAccount.data, marketIndex);
         return {
             data: spotPosition,
@@ -172,7 +198,7 @@ class User {
         if (spotPosition === undefined) {
             return numericConstants_1.ZERO;
         }
-        const spotMarket = this.velocityClient.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.velocityClient.getSpotMarketAccountOrThrow(marketIndex);
         return (0, spotBalance_1.getSignedTokenAmount)((0, spotBalance_2.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType), spotPosition.balanceType);
     }
     getEmptyPosition(marketIndex) {
@@ -201,8 +227,8 @@ class User {
         const perpPosition = this.getPerpPosition(perpMarketIndex);
         if (!perpPosition)
             return numericConstants_1.ZERO;
-        const perpMarket = this.velocityClient.getPerpMarketAccount(perpMarketIndex);
-        const spotMarket = this.velocityClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
+        const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(perpMarketIndex);
+        const spotMarket = this.velocityClient.getSpotMarketAccountOrThrow(perpMarket.quoteSpotMarketIndex);
         if (perpPosition === undefined) {
             return numericConstants_1.ZERO;
         }
@@ -218,8 +244,8 @@ class User {
             if (!((_a = perpPosition.isolatedPositionScaledBalance) === null || _a === void 0 ? void 0 : _a.gt(numericConstants_1.ZERO))) {
                 return total;
             }
-            const perpMarket = this.velocityClient.getPerpMarketAccount(perpPosition.marketIndex);
-            const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
+            const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(perpPosition.marketIndex);
+            const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(perpMarket.quoteSpotMarketIndex);
             const quoteOraclePriceData = this.getOracleDataForSpotMarket(perpMarket.quoteSpotMarketIndex);
             const strictOracle = new strictOraclePrice_1.StrictOraclePrice(quoteOraclePriceData.price, quoteOraclePriceData.twap);
             const tokenAmount = (0, spotBalance_2.getTokenAmount)(perpPosition.isolatedPositionScaledBalance, quoteSpotMarket, types_2.SpotBalanceType.DEPOSIT);
@@ -238,11 +264,11 @@ class User {
      * @returns Order
      */
     getOrder(orderId) {
-        const userAccount = this.getUserAccount();
+        const userAccount = this.getUserAccountOrThrow();
         return this.getOrderForUserAccount(userAccount, orderId);
     }
     getOrderAndSlot(orderId) {
-        const userAccount = this.getUserAccountAndSlot();
+        const userAccount = this.getUserAccountAndSlotOrThrow();
         const order = this.getOrderForUserAccount(userAccount.data, orderId);
         return {
             data: order,
@@ -257,11 +283,11 @@ class User {
      * @returns Order
      */
     getOrderByUserOrderId(userOrderId) {
-        const userAccount = this.getUserAccount();
+        const userAccount = this.getUserAccountOrThrow();
         return this.getOrderByUserIdForUserAccount(userAccount, userOrderId);
     }
     getOrderByUserOrderIdAndSlot(userOrderId) {
-        const userAccount = this.getUserAccountAndSlot();
+        const userAccount = this.getUserAccountAndSlotOrThrow();
         const order = this.getOrderByUserIdForUserAccount(userAccount.data, userOrderId);
         return {
             data: order,
@@ -272,12 +298,14 @@ class User {
         return userAccount === null || userAccount === void 0 ? void 0 : userAccount.orders.filter((order) => (0, types_1.isVariant)(order.status, 'open'));
     }
     getOpenOrders() {
+        var _a;
         const userAccount = this.getUserAccount();
-        return this.getOpenOrdersForUserAccount(userAccount);
+        return (_a = this.getOpenOrdersForUserAccount(userAccount)) !== null && _a !== void 0 ? _a : [];
     }
     getOpenOrdersAndSlot() {
-        const userAccount = this.getUserAccountAndSlot();
-        const openOrders = this.getOpenOrdersForUserAccount(userAccount.data);
+        var _a;
+        const userAccount = this.getUserAccountAndSlotOrThrow();
+        const openOrders = (_a = this.getOpenOrdersForUserAccount(userAccount.data)) !== null && _a !== void 0 ? _a : [];
         return {
             data: openOrders,
             slot: userAccount.slot,
@@ -296,7 +324,7 @@ class User {
      * @returns : open asks
      */
     getPerpBidAsks(marketIndex) {
-        const position = this.getPerpPosition(marketIndex);
+        const position = this.getPerpPositionOrThrow(marketIndex);
         const totalOpenBids = position.openBids;
         const totalOpenAsks = position.openAsks;
         return [totalOpenBids, totalOpenAsks];
@@ -307,7 +335,7 @@ class User {
      */
     getPerpBuyingPower(marketIndex, collateralBuffer = numericConstants_1.ZERO, maxMarginRatio = undefined, positionType = 'cross') {
         const perpPosition = this.getPerpPositionOrEmpty(marketIndex);
-        const perpMarket = this.velocityClient.getPerpMarketAccount(marketIndex);
+        const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(marketIndex);
         const oraclePriceData = this.getOracleDataForPerpMarket(marketIndex);
         const worstCaseBaseAssetAmount = perpPosition
             ? (0, margin_2.calculateWorstCaseBaseAssetAmount)(perpPosition, perpMarket, oraclePriceData.price)
@@ -326,9 +354,14 @@ class User {
         }
         return this.getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, worstCaseBaseAssetAmount, maxMarginRatio || perpPosition.maxMarginRatio);
     }
+    resolveMaxMarginRatio(perpMarketMaxMarginRatio) {
+        // 0 means "no custom margin ratio override", so Math.max returns
+        // userAccount.maxMarginRatio unchanged — the expected semantic.
+        return Math.max(perpMarketMaxMarginRatio !== null && perpMarketMaxMarginRatio !== void 0 ? perpMarketMaxMarginRatio : 0, this.getUserAccountOrThrow().maxMarginRatio);
+    }
     getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, baseAssetAmount, perpMarketMaxMarginRatio = undefined) {
-        const maxMarginRatio = Math.max(perpMarketMaxMarginRatio, this.getUserAccount().maxMarginRatio);
-        const marginRatio = (0, market_1.calculateMarketMarginRatio)(this.velocityClient.getPerpMarketAccount(marketIndex), baseAssetAmount, 'Initial', maxMarginRatio);
+        const maxMarginRatio = this.resolveMaxMarginRatio(perpMarketMaxMarginRatio);
+        const marginRatio = (0, market_1.calculateMarketMarginRatio)(this.velocityClient.getPerpMarketAccountOrThrow(marketIndex), baseAssetAmount, 'Initial', maxMarginRatio);
         return freeCollateral.mul(numericConstants_1.MARGIN_PRECISION).div(new anchor_1.BN(marginRatio));
     }
     /**
@@ -406,11 +439,11 @@ class User {
         });
     }
     getActivePerpPositions() {
-        const userAccount = this.getUserAccount();
+        const userAccount = this.getUserAccountOrThrow();
         return this.getActivePerpPositionsForUserAccount(userAccount);
     }
     getActivePerpPositionsAndSlot() {
-        const userAccount = this.getUserAccountAndSlot();
+        const userAccount = this.getUserAccountAndSlotOrThrow();
         const positions = this.getActivePerpPositionsForUserAccount(userAccount.data);
         return {
             data: positions,
@@ -421,11 +454,11 @@ class User {
         return userAccount.spotPositions.filter((pos) => !(0, spotPosition_1.isSpotPositionAvailable)(pos));
     }
     getActiveSpotPositions() {
-        const userAccount = this.getUserAccount();
+        const userAccount = this.getUserAccountOrThrow();
         return this.getActiveSpotPositionsForUserAccount(userAccount);
     }
     getActiveSpotPositionsAndSlot() {
-        const userAccount = this.getUserAccountAndSlot();
+        const userAccount = this.getUserAccountAndSlotOrThrow();
         const positions = this.getActiveSpotPositionsForUserAccount(userAccount.data);
         return {
             data: positions,
@@ -440,9 +473,9 @@ class User {
         return this.getActivePerpPositions()
             .filter((pos) => marketIndex !== undefined ? pos.marketIndex === marketIndex : true)
             .reduce((unrealizedPnl, perpPosition) => {
-            const market = this.velocityClient.getPerpMarketAccount(perpPosition.marketIndex);
+            const market = this.velocityClient.getPerpMarketAccountOrThrow(perpPosition.marketIndex);
             const oraclePriceData = this.getMMOracleDataForPerpMarket(market.marketIndex);
-            const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
+            const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(market.quoteSpotMarketIndex);
             const quoteOraclePriceData = this.getOracleDataForSpotMarket(market.quoteSpotMarketIndex);
             let positionUnrealizedPnl = (0, position_2.calculatePositionPNL)(market, perpPosition, withFunding, oraclePriceData);
             let quotePrice;
@@ -476,10 +509,10 @@ class User {
      * @returns : Precision QUOTE_PRECISION
      */
     getUnrealizedFundingPNL(marketIndex) {
-        return this.getUserAccount()
+        return this.getUserAccountOrThrow()
             .perpPositions.filter((pos) => marketIndex !== undefined ? pos.marketIndex === marketIndex : true)
             .reduce((pnl, perpPosition) => {
-            const market = this.velocityClient.getPerpMarketAccount(perpPosition.marketIndex);
+            const market = this.velocityClient.getPerpMarketAccountOrThrow(perpPosition.marketIndex);
             return pnl.add((0, position_1.calculateUnsettledFundingPnl)(market, perpPosition));
         }, numericConstants_1.ZERO);
     }
@@ -488,7 +521,7 @@ class User {
         let netQuoteValue = numericConstants_1.ZERO;
         let totalAssetValue = numericConstants_1.ZERO;
         let totalLiabilityValue = numericConstants_1.ZERO;
-        for (const spotPosition of this.getUserAccount().spotPositions) {
+        for (const spotPosition of this.getUserAccountOrThrow().spotPositions) {
             const countForBase = marketIndex === undefined || spotPosition.marketIndex === marketIndex;
             const countForQuote = marketIndex === undefined ||
                 marketIndex === numericConstants_1.QUOTE_SPOT_MARKET_INDEX ||
@@ -497,7 +530,7 @@ class User {
                 (!countForBase && !countForQuote)) {
                 continue;
             }
-            const spotMarketAccount = this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex);
+            const spotMarketAccount = this.velocityClient.getSpotMarketAccountOrThrow(spotPosition.marketIndex);
             const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
             let twap5min;
             if (strict) {
@@ -532,7 +565,7 @@ class User {
                     continue;
                 }
             }
-            const { tokenAmount: worstCaseTokenAmount, ordersValue: worstCaseQuoteTokenAmount, } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, marginCategory, this.getUserAccount().maxMarginRatio);
+            const { tokenAmount: worstCaseTokenAmount, ordersValue: worstCaseQuoteTokenAmount, } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, marginCategory, this.getUserAccountOrThrow().maxMarginRatio);
             if (worstCaseTokenAmount.gt(numericConstants_1.ZERO) && countForBase) {
                 const baseAssetValue = this.getSpotAssetValue(worstCaseTokenAmount, strictOraclePrice, spotMarketAccount, marginCategory);
                 totalAssetValue = totalAssetValue.add(baseAssetValue);
@@ -547,7 +580,7 @@ class User {
             if (worstCaseQuoteTokenAmount.lt(numericConstants_1.ZERO) && countForQuote) {
                 let weight = numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION;
                 if (marginCategory === 'Initial') {
-                    weight = anchor_1.BN.max(weight, new anchor_1.BN(this.getUserAccount().maxMarginRatio));
+                    weight = anchor_1.BN.max(weight, new anchor_1.BN(this.getUserAccountOrThrow().maxMarginRatio));
                 }
                 const weightedTokenValue = worstCaseQuoteTokenAmount
                     .abs()
@@ -572,14 +605,14 @@ class User {
         return totalLiabilityValue;
     }
     getSpotLiabilityValue(tokenAmount, strictOraclePrice, spotMarketAccount, marginCategory, liquidationBuffer) {
-        return (0, spotBalance_2.getSpotLiabilityValue)(tokenAmount, strictOraclePrice, spotMarketAccount, this.getUserAccount().maxMarginRatio, marginCategory, liquidationBuffer);
+        return (0, spotBalance_2.getSpotLiabilityValue)(tokenAmount, strictOraclePrice, spotMarketAccount, this.getUserAccountOrThrow().maxMarginRatio, marginCategory, liquidationBuffer);
     }
     getSpotMarketAssetValue(marketIndex, marginCategory, includeOpenOrders, strict = false, now) {
         const { totalAssetValue } = this.getSpotMarketAssetAndLiabilityValue(marketIndex, marginCategory, undefined, includeOpenOrders, strict, now);
         return totalAssetValue;
     }
     getSpotAssetValue(tokenAmount, strictOraclePrice, spotMarketAccount, marginCategory) {
-        return (0, spotBalance_2.getSpotAssetValue)(tokenAmount, strictOraclePrice, spotMarketAccount, this.getUserAccount().maxMarginRatio, marginCategory);
+        return (0, spotBalance_2.getSpotAssetValue)(tokenAmount, strictOraclePrice, spotMarketAccount, this.getUserAccountOrThrow().maxMarginRatio, marginCategory);
     }
     getSpotPositionValue(marketIndex, marginCategory, includeOpenOrders, strict = false, now) {
         const { totalAssetValue, totalLiabilityValue } = this.getSpotMarketAssetAndLiabilityValue(marketIndex, marginCategory, undefined, includeOpenOrders, strict, now);
@@ -609,7 +642,11 @@ class User {
             liquidationBufferMap,
         });
         if (perpMarketIndex !== undefined) {
-            const { totalCollateral, totalCollateralBuffer } = marginCalc.isolatedMarginCalculations.get(perpMarketIndex);
+            const isolatedMarginCalculation = marginCalc.isolatedMarginCalculations.get(perpMarketIndex);
+            if (!isolatedMarginCalculation) {
+                throw new Error(`No isolated margin calculation for perp market ${perpMarketIndex}`);
+            }
+            const { totalCollateral, totalCollateralBuffer } = isolatedMarginCalculation;
             if (liquidationBuffer === null || liquidationBuffer === void 0 ? void 0 : liquidationBuffer.gt(numericConstants_1.ZERO)) {
                 return totalCollateralBuffer;
             }
@@ -673,7 +710,7 @@ class User {
         return health;
     }
     calculateWeightedPerpPositionLiability(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict = false) {
-        const market = this.velocityClient.getPerpMarketAccount(perpPosition.marketIndex);
+        const market = this.velocityClient.getPerpMarketAccountOrThrow(perpPosition.marketIndex);
         let valuationPrice = this.getOracleDataForPerpMarket(market.marketIndex).price;
         if ((0, types_1.isVariant)(market.status, 'settlement')) {
             valuationPrice = market.expiryPrice;
@@ -690,7 +727,7 @@ class User {
             liabilityValue = (0, margin_1.calculatePerpLiabilityValue)(baseAssetAmount, valuationPrice);
         }
         if (marginCategory) {
-            const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
+            const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccountOrThrow().maxMarginRatio);
             let marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory, userCustomMargin));
             if (liquidationBuffer !== undefined) {
                 marginRatio = marginRatio.add(liquidationBuffer);
@@ -698,7 +735,7 @@ class User {
             if ((0, types_1.isVariant)(market.status, 'settlement')) {
                 marginRatio = numericConstants_1.ZERO;
             }
-            const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
+            const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(market.quoteSpotMarketIndex);
             const quoteOraclePriceData = this.velocityClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
             let quotePrice;
             if (strict) {
@@ -723,7 +760,7 @@ class User {
      * @returns : Precision QUOTE_PRECISION
      */
     getPerpMarketLiabilityValue(marketIndex, marginCategory, liquidationBuffer, includeOpenOrders, strict = false) {
-        const perpPosition = this.getPerpPosition(marketIndex);
+        const perpPosition = this.getPerpPositionOrThrow(marketIndex);
         return this.calculateWeightedPerpPositionLiability(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict);
     }
     /**
@@ -742,7 +779,7 @@ class User {
      */
     getPerpPositionValue(marketIndex, oraclePriceData, includeOpenOrders = false) {
         const userPosition = this.getPerpPositionOrEmpty(marketIndex);
-        const market = this.velocityClient.getPerpMarketAccount(userPosition.marketIndex);
+        const market = this.velocityClient.getPerpMarketAccountOrThrow(userPosition.marketIndex);
         return (0, margin_2.calculateBaseAssetValueWithOracle)(market, userPosition, oraclePriceData, includeOpenOrders);
     }
     /**
@@ -751,7 +788,7 @@ class User {
      */
     getPerpLiabilityValue(marketIndex, oraclePriceData, includeOpenOrders = false) {
         const userPosition = this.getPerpPositionOrEmpty(marketIndex);
-        const market = this.velocityClient.getPerpMarketAccount(userPosition.marketIndex);
+        const market = this.velocityClient.getPerpMarketAccountOrThrow(userPosition.marketIndex);
         if (includeOpenOrders) {
             return (0, margin_1.calculateWorstCasePerpLiabilityValue)(userPosition, market, oraclePriceData.price).worstCaseLiabilityValue;
         }
@@ -775,7 +812,7 @@ class User {
      * @returns : Precision PRICE_PRECISION
      */
     getPositionEstimatedExitPriceAndPnl(position, amountToClose, useAMMClose = false) {
-        const market = this.velocityClient.getPerpMarketAccount(position.marketIndex);
+        const market = this.velocityClient.getPerpMarketAccountOrThrow(position.marketIndex);
         const entryPrice = (0, position_1.calculateEntryPrice)(position);
         const oraclePriceData = this.getMMOracleDataForPerpMarket(position.marketIndex);
         if (amountToClose) {
@@ -831,9 +868,9 @@ class User {
         if (perpMarketIndex) {
             const perpPosition = this.getPerpPositionOrEmpty(perpMarketIndex);
             const perpLiability = this.calculateWeightedPerpPositionLiability(perpPosition, marginCategory, undefined, includeOpenOrders);
-            const perpMarket = this.velocityClient.getPerpMarketAccount(perpPosition.marketIndex);
+            const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(perpPosition.marketIndex);
             const oraclePriceData = this.getOracleDataForPerpMarket(perpPosition.marketIndex);
-            const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
+            const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(perpMarket.quoteSpotMarketIndex);
             const quoteOraclePriceData = this.getOracleDataForSpotMarket(perpMarket.quoteSpotMarketIndex);
             const strictOracle = new strictOraclePrice_1.StrictOraclePrice(quoteOraclePriceData.price, quoteOraclePriceData.twap);
             const positionUnrealizedPnl = (0, position_2.calculatePositionPNL)(perpMarket, perpPosition, true, oraclePriceData);
@@ -862,6 +899,9 @@ class User {
     isDustDepositPosition(spotMarketAccount) {
         const marketIndex = spotMarketAccount.marketIndex;
         const spotPosition = this.getSpotPosition(spotMarketAccount.marketIndex);
+        if (!spotPosition) {
+            throw new Error(`No spot position found for market ${spotMarketAccount.marketIndex}`);
+        }
         if ((0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
             return false;
         }
@@ -911,8 +951,8 @@ class User {
      */
     getTotalAllTimePnl() {
         const netUsdValue = this.getNetUsdValue();
-        const totalDeposits = this.getUserAccount().totalDeposits;
-        const totalWithdraws = this.getUserAccount().totalWithdraws;
+        const totalDeposits = this.getUserAccountOrThrow().totalDeposits;
+        const totalWithdraws = this.getUserAccountOrThrow().totalWithdraws;
         const totalPnl = netUsdValue.add(totalWithdraws).sub(totalDeposits);
         return totalPnl;
     }
@@ -1052,7 +1092,7 @@ class User {
             this.hasIsolatedPositionBeingLiquidated());
     }
     isCrossMarginBeingLiquidated() {
-        return ((this.getUserAccount().status &
+        return ((this.getUserAccountOrThrow().status &
             (types_1.UserStatus.BEING_LIQUIDATED | types_1.UserStatus.BANKRUPT)) >
             0);
     }
@@ -1067,8 +1107,9 @@ class User {
             0);
     }
     isIsolatedPositionBeingLiquidated(perpMarketIndex) {
+        var _a;
         const position = this.getActivePerpPositions().find((position) => position.marketIndex === perpMarketIndex);
-        return (((position === null || position === void 0 ? void 0 : position.positionFlag) &
+        return ((((_a = position === null || position === void 0 ? void 0 : position.positionFlag) !== null && _a !== void 0 ? _a : 0) &
             (types_2.PositionFlag.BeingLiquidated | types_2.PositionFlag.Bankruptcy)) >
             0);
     }
@@ -1087,23 +1128,23 @@ class User {
         return isolatedMarginCalculation.totalCollateral.lt(isolatedMarginCalculation.marginRequirement);
     }
     hasStatus(status) {
-        return (this.getUserAccount().status & status) > 0;
+        return (this.getUserAccountOrThrow().status & status) > 0;
     }
     isBankrupt() {
-        return (this.getUserAccount().status & types_1.UserStatus.BANKRUPT) > 0;
+        return (this.getUserAccountOrThrow().status & types_1.UserStatus.BANKRUPT) > 0;
     }
     /**
      * Checks if any user position cumulative funding differs from respective market cumulative funding
      * @returns
      */
     needsToSettleFundingPayment() {
-        for (const userPosition of this.getUserAccount().perpPositions) {
+        for (const userPosition of this.getUserAccountOrThrow().perpPositions) {
             if (userPosition.baseAssetAmount.eq(numericConstants_1.ZERO)) {
                 continue;
             }
-            const market = this.velocityClient.getPerpMarketAccount(userPosition.marketIndex);
-            if (market.amm.cumulativeFundingRateLong.eq(userPosition.lastCumulativeFundingRate) ||
-                market.amm.cumulativeFundingRateShort.eq(userPosition.lastCumulativeFundingRate)) {
+            const market = this.velocityClient.getPerpMarketAccountOrThrow(userPosition.marketIndex);
+            if (market.cumulativeFundingRateLong.eq(userPosition.lastCumulativeFundingRate) ||
+                market.cumulativeFundingRateShort.eq(userPosition.lastCumulativeFundingRate)) {
                 continue;
             }
             return true;
@@ -1123,7 +1164,7 @@ class User {
         const totalCollateral = this.getTotalCollateral('Maintenance');
         const maintenanceMarginRequirement = this.getMaintenanceMarginRequirement();
         const freeCollateral = anchor_1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(maintenanceMarginRequirement));
-        const market = this.velocityClient.getSpotMarketAccount(marketIndex);
+        const market = this.velocityClient.getSpotMarketAccountOrThrow(marketIndex);
         let signedTokenAmount = (0, spotBalance_1.getSignedTokenAmount)((0, spotBalance_2.getTokenAmount)(currentSpotPosition.scaledBalance, market, currentSpotPosition.balanceType), currentSpotPosition.balanceType);
         signedTokenAmount = signedTokenAmount.add(positionBaseSizeChange);
         if (signedTokenAmount.eq(numericConstants_1.ZERO)) {
@@ -1133,14 +1174,14 @@ class User {
         const oracle = market.oracle;
         const perpMarketWithSameOracle = this.velocityClient
             .getPerpMarketAccounts()
-            .find((market) => market.amm.oracle.equals(oracle));
+            .find((market) => market.oracle.equals(oracle));
         const oraclePrice = this.velocityClient.getOracleDataForSpotMarket(marketIndex).price;
         if (perpMarketWithSameOracle) {
             const perpPosition = this.getPerpPositionOrEmpty(perpMarketWithSameOracle.marketIndex);
             if (perpPosition) {
                 let freeCollateralDeltaForPerp = this.calculateFreeCollateralDeltaForPerp(perpMarketWithSameOracle, perpPosition, numericConstants_1.ZERO, oraclePrice);
                 if (freeCollateralDeltaForPerp) {
-                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.oracleSource, perpMarketWithSameOracle.amm.oracleSource);
+                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.oracleSource, perpMarketWithSameOracle.oracleSource);
                     freeCollateralDeltaForPerp = freeCollateralDeltaForPerp
                         .mul(numerator)
                         .div(denominator);
@@ -1171,8 +1212,8 @@ class User {
      * @returns Precision : PRICE_PRECISION
      */
     liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance', includeOpenOrders = false, offsetCollateral = numericConstants_1.ZERO, marginType) {
-        const market = this.velocityClient.getPerpMarketAccount(marketIndex);
-        const oracle = this.velocityClient.getPerpMarketAccount(marketIndex).amm.oracle;
+        const market = this.velocityClient.getPerpMarketAccountOrThrow(marketIndex);
+        const oracle = market.oracle;
         const oraclePrice = this.velocityClient.getOracleDataForPerpMarket(marketIndex).price;
         const currentPerpPosition = this.getPerpPositionOrEmpty(marketIndex);
         if (marginType === 'Isolated') {
@@ -1201,7 +1242,7 @@ class User {
         const totalCollateral = this.getTotalCollateral(marginCategory, false, includeOpenOrders);
         const marginRequirement = this.getMarginRequirement(marginCategory, undefined, false, includeOpenOrders);
         let freeCollateral = anchor_1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(marginRequirement)).add(offsetCollateral);
-        positionBaseSizeChange = (0, orders_1.standardizeBaseAssetAmount)(positionBaseSizeChange, market.amm.orderStepSize);
+        positionBaseSizeChange = (0, orders_1.standardizeBaseAssetAmount)(positionBaseSizeChange, market.orderStepSize);
         const freeCollateralChangeFromNewPosition = this.calculateEntriesEffectOnFreeCollateral(market, oraclePrice, currentPerpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders);
         freeCollateral = freeCollateral.add(freeCollateralChangeFromNewPosition);
         let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange, oraclePrice, marginCategory, includeOpenOrders);
@@ -1217,7 +1258,7 @@ class User {
                 const signedTokenAmount = (0, spotBalance_1.getSignedTokenAmount)((0, spotBalance_2.getTokenAmount)(spotPosition.scaledBalance, spotMarketWithSameOracle, spotPosition.balanceType), spotPosition.balanceType);
                 let spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(spotMarketWithSameOracle, signedTokenAmount, marginCategory);
                 if (spotFreeCollateralDelta) {
-                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.amm.oracleSource, spotMarketWithSameOracle.oracleSource);
+                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.oracleSource, spotMarketWithSameOracle.oracleSource);
                     spotFreeCollateralDelta = spotFreeCollateralDelta
                         .mul(numerator)
                         .div(denominator);
@@ -1274,7 +1315,7 @@ class User {
                 baseAssetAmount = perpPosition.baseAssetAmount;
                 liabilityValue = (0, margin_1.calculatePerpLiabilityValue)(baseAssetAmount, oraclePrice);
             }
-            const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
+            const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccountOrThrow().maxMarginRatio);
             const marginRatio = (0, market_1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory, userCustomMargin);
             return liabilityValue.mul(new anchor_1.BN(marginRatio)).div(numericConstants_1.MARGIN_PRECISION);
         };
@@ -1291,7 +1332,7 @@ class User {
         // zero if include orders == false
         const orderBaseAssetAmount = baseAssetAmount.sub(perpPosition.baseAssetAmount);
         const proposedBaseAssetAmount = baseAssetAmount.add(positionBaseSizeChange);
-        const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
+        const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccountOrThrow().maxMarginRatio);
         const marginRatio = (0, market_1.calculateMarketMarginRatio)(market, proposedBaseAssetAmount.abs(), marginCategory, userCustomMargin);
         const marginRatioQuotePrecision = new anchor_1.BN(marginRatio)
             .mul(numericConstants_1.QUOTE_PRECISION)
@@ -1355,11 +1396,11 @@ class User {
         return this.liquidationPrice(positionMarketIndex, closeBaseAmount, estimatedEntryPrice);
     }
     getMarginUSDCRequiredForTrade(targetMarketIndex, baseSize, estEntryPrice, perpMarketMaxMarginRatio) {
-        const maxMarginRatio = Math.max(perpMarketMaxMarginRatio, this.getUserAccount().maxMarginRatio);
+        const maxMarginRatio = this.resolveMaxMarginRatio(perpMarketMaxMarginRatio);
         return (0, margin_2.calculateMarginUSDCRequiredForTrade)(this.velocityClient, targetMarketIndex, baseSize, maxMarginRatio, estEntryPrice);
     }
     getCollateralDepositRequiredForTrade(targetMarketIndex, baseSize, collateralIndex, perpMarketMaxMarginRatio) {
-        const maxMarginRatio = Math.max(perpMarketMaxMarginRatio, this.getUserAccount().maxMarginRatio);
+        const maxMarginRatio = this.resolveMaxMarginRatio(perpMarketMaxMarginRatio);
         return (0, margin_2.calculateCollateralDepositRequiredForTrade)(this.velocityClient, targetMarketIndex, baseSize, collateralIndex, maxMarginRatio);
     }
     /**
@@ -1382,7 +1423,7 @@ class User {
             ? true
             : targetSide === currentPositionSide;
         const oracleData = this.getMMOracleDataForPerpMarket(targetMarketIndex);
-        const marketAccount = this.velocityClient.getPerpMarketAccount(targetMarketIndex);
+        const marketAccount = this.velocityClient.getPerpMarketAccountOrThrow(targetMarketIndex);
         // add any position we have on the opposite side of the current trade, because we can "flip" the size of this position without taking any extra leverage.
         const oppositeSizeLiabilityValue = targetingSameSide
             ? numericConstants_1.ZERO
@@ -1406,7 +1447,7 @@ class User {
                 const perpLiabilityValue = (0, margin_1.calculatePerpLiabilityValue)(currentPosition.baseAssetAmount, oracleData.price);
                 const totalCollateral = this.getTotalCollateral();
                 const marginRequirement = this.getInitialMarginRequirement();
-                const marginRatio = Math.max(currentPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
+                const marginRatio = Math.max(currentPosition.maxMarginRatio, this.getUserAccountOrThrow().maxMarginRatio);
                 const marginFreedByClosing = perpLiabilityValue
                     .mul(new anchor_1.BN(marginRatio))
                     .div(numericConstants_1.MARGIN_PRECISION);
@@ -1453,7 +1494,7 @@ class User {
      * @returns tradeSizeAllowed : Precision QUOTE_PRECISION
      */
     getMaxTradeSizeUSDCForSpot(targetMarketIndex, direction, currentQuoteAssetValue, currentSpotMarketNetValue) {
-        const market = this.velocityClient.getSpotMarketAccount(targetMarketIndex);
+        const market = this.velocityClient.getSpotMarketAccountOrThrow(targetMarketIndex);
         const oraclePrice = this.velocityClient.getOracleDataForSpotMarket(targetMarketIndex).price;
         currentQuoteAssetValue = this.getSpotMarketAssetValue(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
         currentSpotMarketNetValue =
@@ -1461,19 +1502,19 @@ class User {
         let freeCollateral = this.getFreeCollateral();
         const marginRatio = (0, spotMarket_1.calculateSpotMarketMarginRatio)(market, oraclePrice, 'Initial', numericConstants_1.ZERO, (0, types_1.isVariant)(direction, 'long')
             ? types_2.SpotBalanceType.DEPOSIT
-            : types_2.SpotBalanceType.BORROW, this.getUserAccount().maxMarginRatio);
+            : types_2.SpotBalanceType.BORROW, this.getUserAccountOrThrow().maxMarginRatio);
         let tradeAmount = numericConstants_1.ZERO;
-        if (this.getUserAccount().isMarginTradingEnabled) {
+        if (this.getUserAccountOrThrow().isMarginTradingEnabled) {
             // if the user is buying/selling and already short/long, need to account for closing out short/long
             if ((0, types_1.isVariant)(direction, 'long') && currentSpotMarketNetValue.lt(numericConstants_1.ZERO)) {
                 tradeAmount = currentSpotMarketNetValue.abs();
-                const marginRatio = (0, spotMarket_1.calculateSpotMarketMarginRatio)(market, oraclePrice, 'Initial', this.getTokenAmount(targetMarketIndex).abs(), types_2.SpotBalanceType.BORROW, this.getUserAccount().maxMarginRatio);
+                const marginRatio = (0, spotMarket_1.calculateSpotMarketMarginRatio)(market, oraclePrice, 'Initial', this.getTokenAmount(targetMarketIndex).abs(), types_2.SpotBalanceType.BORROW, this.getUserAccountOrThrow().maxMarginRatio);
                 freeCollateral = freeCollateral.add(tradeAmount.mul(new anchor_1.BN(marginRatio)).div(numericConstants_1.MARGIN_PRECISION));
             }
             else if ((0, types_1.isVariant)(direction, 'short') &&
                 currentSpotMarketNetValue.gt(numericConstants_1.ZERO)) {
                 tradeAmount = currentSpotMarketNetValue;
-                const marginRatio = (0, spotMarket_1.calculateSpotMarketMarginRatio)(market, oraclePrice, 'Initial', this.getTokenAmount(targetMarketIndex), types_2.SpotBalanceType.DEPOSIT, this.getUserAccount().maxMarginRatio);
+                const marginRatio = (0, spotMarket_1.calculateSpotMarketMarginRatio)(market, oraclePrice, 'Initial', this.getTokenAmount(targetMarketIndex), types_2.SpotBalanceType.DEPOSIT, this.getUserAccountOrThrow().maxMarginRatio);
                 freeCollateral = freeCollateral.add(tradeAmount.mul(new anchor_1.BN(marginRatio)).div(numericConstants_1.MARGIN_PRECISION));
             }
             tradeAmount = tradeAmount.add(freeCollateral.mul(numericConstants_1.MARGIN_PRECISION).div(new anchor_1.BN(marginRatio)));
@@ -1496,8 +1537,8 @@ class User {
      * @param iterationLimit how long to run appromixation before erroring out
      */
     getMaxSwapAmount({ inMarketIndex, outMarketIndex, calculateSwap, iterationLimit = 1000, }) {
-        const inMarket = this.velocityClient.getSpotMarketAccount(inMarketIndex);
-        const outMarket = this.velocityClient.getSpotMarketAccount(outMarketIndex);
+        const inMarket = this.velocityClient.getSpotMarketAccountOrThrow(inMarketIndex);
+        const outMarket = this.velocityClient.getSpotMarketAccountOrThrow(outMarketIndex);
         const inOraclePriceData = this.getOracleDataForSpotMarket(inMarketIndex);
         const inOraclePrice = inOraclePriceData.price;
         const outOraclePriceData = this.getOracleDataForSpotMarket(outMarketIndex);
@@ -1603,7 +1644,7 @@ class User {
             return clonedPosition;
         }
         const preTokenAmount = (0, spotBalance_1.getSignedTokenAmount)((0, spotBalance_2.getTokenAmount)(position.scaledBalance, market, position.balanceType), position.balanceType);
-        if ((0, utils_1.sigNum)(preTokenAmount).eq((0, utils_1.sigNum)(tokenAmount))) {
+        if ((0, utils_2.sigNum)(preTokenAmount).eq((0, utils_2.sigNum)(tokenAmount))) {
             const scaledBalanceDelta = (0, spotBalance_1.getBalance)(tokenAmount.abs(), market, position.balanceType);
             clonedPosition.scaledBalance =
                 clonedPosition.scaledBalance.add(scaledBalanceDelta);
@@ -1625,15 +1666,15 @@ class User {
     }
     calculateSpotPositionFreeCollateralContribution(spotPosition, strictOraclePrice) {
         const marginCategory = 'Initial';
-        const spotMarketAccount = this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex);
-        const { freeCollateralContribution } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, marginCategory, this.getUserAccount().maxMarginRatio);
+        const spotMarketAccount = this.velocityClient.getSpotMarketAccountOrThrow(spotPosition.marketIndex);
+        const { freeCollateralContribution } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, marginCategory, this.getUserAccountOrThrow().maxMarginRatio);
         return freeCollateralContribution;
     }
     calculateSpotPositionLeverageContribution(spotPosition, strictOraclePrice) {
         let totalAssetValue = numericConstants_1.ZERO;
         let totalLiabilityValue = numericConstants_1.ZERO;
-        const spotMarketAccount = this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex);
-        const { tokenValue, ordersValue } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, 'Initial', this.getUserAccount().maxMarginRatio);
+        const spotMarketAccount = this.velocityClient.getSpotMarketAccountOrThrow(spotPosition.marketIndex);
+        const { tokenValue, ordersValue } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, 'Initial', this.getUserAccountOrThrow().maxMarginRatio);
         if (tokenValue.gte(numericConstants_1.ZERO)) {
             totalAssetValue = tokenValue;
         }
@@ -1659,8 +1700,8 @@ class User {
      * @param outAmount
      */
     accountLeverageAfterSwap({ inMarketIndex, outMarketIndex, inAmount, outAmount, }) {
-        const inMarket = this.velocityClient.getSpotMarketAccount(inMarketIndex);
-        const outMarket = this.velocityClient.getSpotMarketAccount(outMarketIndex);
+        const inMarket = this.velocityClient.getSpotMarketAccountOrThrow(inMarketIndex);
+        const outMarket = this.velocityClient.getSpotMarketAccountOrThrow(outMarketIndex);
         const inOraclePriceData = this.getOracleDataForSpotMarket(inMarketIndex);
         const inOraclePrice = inOraclePriceData.price;
         const outOraclePriceData = this.getOracleDataForSpotMarket(outMarketIndex);
@@ -1747,7 +1788,7 @@ class User {
             return newLeverage;
         }
         const currentPosition = this.getPerpPositionOrEmpty(targetMarketIndex);
-        const perpMarket = this.velocityClient.getPerpMarketAccount(targetMarketIndex);
+        const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(targetMarketIndex);
         const oracleData = this.getOracleDataForPerpMarket(targetMarketIndex);
         let { 
         // eslint-disable-next-line prefer-const
@@ -1782,13 +1823,11 @@ class User {
     }
     getUserFeeTier(marketType, now) {
         const state = this.velocityClient.getStateAccount();
-        const feeTierIndex = 0;
         if ((0, types_1.isVariant)(marketType, 'perp')) {
             const userStatsAccount = this.velocityClient
-                .getUserStats()
-                .getAccount();
+                .getUserStatsOrThrow()
+                .getAccountOrThrow();
             const total30dVolume = (0, trade_1.getUser30dRollingVolumeEstimate)(userStatsAccount, now);
-            const stakedGovAssetAmount = userStatsAccount.ifStakedGovTokenAmount;
             const volumeThresholds = [
                 new anchor_1.BN(2000000).mul(numericConstants_1.QUOTE_PRECISION),
                 new anchor_1.BN(10000000).mul(numericConstants_1.QUOTE_PRECISION),
@@ -1796,14 +1835,6 @@ class User {
                 new anchor_1.BN(80000000).mul(numericConstants_1.QUOTE_PRECISION),
                 new anchor_1.BN(200000000).mul(numericConstants_1.QUOTE_PRECISION),
             ];
-            const stakeThresholds = [
-                new anchor_1.BN(1000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
-                new anchor_1.BN(10000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
-                new anchor_1.BN(50000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
-                new anchor_1.BN(100000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
-                new anchor_1.BN(250000 - 5).mul(numericConstants_1.QUOTE_PRECISION),
-            ];
-            const stakeBenefitFrac = [0, 5, 10, 20, 30, 40];
             let feeTierIndex = 5;
             for (let i = 0; i < volumeThresholds.length; i++) {
                 if (total30dVolume.lt(volumeThresholds[i])) {
@@ -1811,23 +1842,9 @@ class User {
                     break;
                 }
             }
-            let stakeBenefitIndex = 5;
-            for (let i = 0; i < stakeThresholds.length; i++) {
-                if (stakedGovAssetAmount.lt(stakeThresholds[i])) {
-                    stakeBenefitIndex = i;
-                    break;
-                }
-            }
-            const stakeBenefit = stakeBenefitFrac[stakeBenefitIndex];
-            const tier = { ...state.perpFeeStructure.feeTiers[feeTierIndex] };
-            if (stakeBenefit > 0) {
-                tier.feeNumerator = (tier.feeNumerator * (100 - stakeBenefit)) / 100;
-                tier.makerRebateNumerator =
-                    (tier.makerRebateNumerator * (100 + stakeBenefit)) / 100;
-            }
-            return tier;
+            return state.perpFeeStructure.feeTiers[feeTierIndex];
         }
-        return state.spotFeeStructure.feeTiers[feeTierIndex];
+        return state.spotFeeStructure.feeTiers[0];
     }
     /**
      * Calculates how much perp fee will be taken for a given sized trade
@@ -1856,7 +1873,7 @@ class User {
      */
     getWithdrawalLimit(marketIndex, reduceOnly) {
         const nowTs = new anchor_1.BN(Math.floor(Date.now() / 1000));
-        const spotMarket = this.velocityClient.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.velocityClient.getSpotMarketAccountOrThrow(marketIndex);
         // eslint-disable-next-line prefer-const
         let { borrowLimit, withdrawLimit } = (0, spotBalance_2.calculateWithdrawLimit)(spotMarket, nowTs);
         const freeCollateral = this.getFreeCollateral();
@@ -1884,7 +1901,7 @@ class User {
             amountWithdrawable = userDepositAmount;
         }
         else {
-            amountWithdrawable = (0, utils_1.divCeil)((0, utils_1.divCeil)(freeCollateral.mul(numericConstants_1.MARGIN_PRECISION), assetWeight).mul(numericConstants_1.PRICE_PRECISION), oracleData.price)
+            amountWithdrawable = (0, utils_2.divCeil)((0, utils_2.divCeil)(freeCollateral.mul(numericConstants_1.MARGIN_PRECISION), assetWeight).mul(numericConstants_1.PRICE_PRECISION), oracleData.price)
                 .mul(numeratorScale)
                 .div(denominatorScale);
         }
@@ -1909,10 +1926,10 @@ class User {
         }
     }
     canBypassWithdrawLimits(marketIndex) {
-        const spotMarket = this.velocityClient.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.velocityClient.getSpotMarketAccountOrThrow(marketIndex);
         const maxDepositAmount = spotMarket.withdrawGuardThreshold.div(new anchor_1.BN(10));
         const position = this.getSpotPosition(marketIndex);
-        const netDeposits = this.getUserAccount().totalDeposits.sub(this.getUserAccount().totalWithdraws);
+        const netDeposits = this.getUserAccountOrThrow().totalDeposits.sub(this.getUserAccountOrThrow().totalWithdraws);
         if (!position) {
             return {
                 canBypass: false,
@@ -1946,7 +1963,7 @@ class User {
         };
     }
     canMakeIdle(slot) {
-        const userAccount = this.getUserAccount();
+        const userAccount = this.getUserAccountOrThrow();
         if (userAccount.idle) {
             return false;
         }
@@ -1989,12 +2006,13 @@ class User {
         return true;
     }
     canBeDeleted(userStatsAccount, now) {
-        const userAccount = this.getUserAccount();
-        const userStatsAccountToUse = userStatsAccount || this.velocityClient.getUserStats().getAccount();
+        const userAccount = this.getUserAccountOrThrow();
+        const userStatsAccountToUse = userStatsAccount !== null && userStatsAccount !== void 0 ? userStatsAccount : this.velocityClient.getUserStatsOrThrow().getAccount();
         const nowInSeconds = now || new anchor_1.BN(Math.floor(Date.now() / 1000));
         const stateAccount = this.velocityClient.getStateAccount();
         // Referrer cannot delete sub_account_id 0
-        const isReferrer = (userStatsAccountToUse.referrerStatus & types_1.ReferrerStatus.IsReferrer) > 0;
+        const isReferrer = userStatsAccountToUse !== undefined &&
+            (userStatsAccountToUse.referrerStatus & types_1.ReferrerStatus.IsReferrer) > 0;
         if (isReferrer && userAccount.subAccountId === 0) {
             return { canDelete: false, reason: 'is-subaccount-0-referrer' };
         }
@@ -2023,7 +2041,7 @@ class User {
             }
         }
         // Fresh account (< 13 days) with init fee must be idle
-        if (stateAccount.maxInitializeUserFee > 0) {
+        if (stateAccount.maxInitializeUserFee > 0 && userStatsAccountToUse) {
             const minActionTs = anchor_1.BN.min(userStatsAccountToUse.lastFillerVolume30DTs, anchor_1.BN.min(userStatsAccountToUse.lastMakerVolume30DTs, userStatsAccountToUse.lastTakerVolume30DTs));
             const estimatedAge = anchor_1.BN.max(nowInSeconds.sub(minActionTs), numericConstants_1.ZERO);
             if (estimatedAge.lt(new anchor_1.BN(numericConstants_1.ACCOUNT_AGE_DELETION_CUTOFF_SECONDS))) {
@@ -2041,13 +2059,13 @@ class User {
         let safestPerpTier = 4;
         let safestSpotTier = 4;
         for (const perpPosition of this.getActivePerpPositions()) {
-            safestPerpTier = Math.min(safestPerpTier, (0, tiers_1.getPerpMarketTierNumber)(this.velocityClient.getPerpMarketAccount(perpPosition.marketIndex)));
+            safestPerpTier = Math.min(safestPerpTier, (0, tiers_1.getPerpMarketTierNumber)(this.velocityClient.getPerpMarketAccountOrThrow(perpPosition.marketIndex)));
         }
         for (const spotPosition of this.getActiveSpotPositions()) {
             if ((0, types_1.isVariant)(spotPosition.balanceType, 'deposit')) {
                 continue;
             }
-            safestSpotTier = Math.min(safestSpotTier, (0, tiers_1.getSpotMarketTierNumber)(this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex)));
+            safestSpotTier = Math.min(safestSpotTier, (0, tiers_1.getSpotMarketTierNumber)(this.velocityClient.getSpotMarketAccountOrThrow(spotPosition.marketIndex)));
         }
         return {
             perpTier: safestPerpTier,
@@ -2055,7 +2073,7 @@ class User {
         };
     }
     getPerpPositionHealth({ marginCategory, perpPosition, oraclePriceData, quoteOraclePriceData, includeOpenOrders = true, }) {
-        const perpMarket = this.velocityClient.getPerpMarketAccount(perpPosition.marketIndex);
+        const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(perpPosition.marketIndex);
         const _oraclePriceData = oraclePriceData ||
             this.velocityClient.getOracleDataForPerpMarket(perpMarket.marketIndex);
         const oraclePrice = _oraclePriceData.price;
@@ -2070,7 +2088,7 @@ class User {
             worstCaseBaseAmount = perpPosition.baseAssetAmount;
             worstCaseLiabilityValue = (0, margin_1.calculatePerpLiabilityValue)(perpPosition.baseAssetAmount, oraclePrice);
         }
-        const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
+        const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccountOrThrow().maxMarginRatio);
         const marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(perpMarket, worstCaseBaseAmount.abs(), marginCategory, userCustomMargin));
         const _quoteOraclePriceData = quoteOraclePriceData ||
             this.velocityClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
@@ -2096,7 +2114,7 @@ class User {
             perpPnl: [],
         };
         for (const perpPosition of this.getActivePerpPositions()) {
-            const perpMarket = this.velocityClient.getPerpMarketAccount(perpPosition.marketIndex);
+            const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(perpPosition.marketIndex);
             const oraclePriceData = this.velocityClient.getOracleDataForPerpMarket(perpMarket.marketIndex);
             const quoteOraclePriceData = this.velocityClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
             healthComponents.perpPositions.push(this.getPerpPositionHealth({
@@ -2105,7 +2123,7 @@ class User {
                 oraclePriceData,
                 quoteOraclePriceData,
             }));
-            const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
+            const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(perpMarket.quoteSpotMarketIndex);
             const positionUnrealizedPnl = (0, position_2.calculatePositionPNL)(perpMarket, perpPosition, true, oraclePriceData);
             let pnlWeight;
             if (positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
@@ -2130,7 +2148,7 @@ class User {
         }
         let netQuoteValue = numericConstants_1.ZERO;
         for (const spotPosition of this.getActiveSpotPositions()) {
-            const spotMarketAccount = this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex);
+            const spotMarketAccount = this.velocityClient.getSpotMarketAccountOrThrow(spotPosition.marketIndex);
             const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
             const strictOraclePrice = new strictOraclePrice_1.StrictOraclePrice(oraclePriceData.price);
             if (spotPosition.marketIndex === numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
@@ -2138,7 +2156,7 @@ class User {
                 netQuoteValue = netQuoteValue.add(tokenAmount);
                 continue;
             }
-            const { tokenAmount: worstCaseTokenAmount, tokenValue: tokenValue, weight, weightedTokenValue: weightedTokenValue, ordersValue: ordersValue, } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, marginCategory, this.getUserAccount().maxMarginRatio);
+            const { tokenAmount: worstCaseTokenAmount, tokenValue: tokenValue, weight, weightedTokenValue: weightedTokenValue, ordersValue: ordersValue, } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, marginCategory, this.getUserAccountOrThrow().maxMarginRatio);
             netQuoteValue = netQuoteValue.add(ordersValue);
             const baseAssetValue = tokenValue.abs();
             const weightedValue = weightedTokenValue.abs();
@@ -2165,7 +2183,7 @@ class User {
             const spotMarketAccount = this.velocityClient.getQuoteSpotMarketAccount();
             const oraclePriceData = this.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
             const baseAssetValue = (0, spotBalance_1.getTokenValue)(netQuoteValue, spotMarketAccount.decimals, oraclePriceData);
-            const { weight, weightedTokenValue } = (0, spotPosition_1.calculateWeightedTokenValue)(netQuoteValue, baseAssetValue, oraclePriceData.price, spotMarketAccount, marginCategory, this.getUserAccount().maxMarginRatio);
+            const { weight, weightedTokenValue } = (0, spotPosition_1.calculateWeightedTokenValue)(netQuoteValue, baseAssetValue, oraclePriceData.price, spotMarketAccount, marginCategory, this.getUserAccountOrThrow().maxMarginRatio);
             if (netQuoteValue.lt(numericConstants_1.ZERO)) {
                 healthComponents.borrows.push({
                     marketIndex: spotMarketAccount.marketIndex,
@@ -2232,7 +2250,9 @@ class User {
         const liquidationBufferMap = (_b = opts === null || opts === void 0 ? void 0 : opts.liquidationBufferMap) !== null && _b !== void 0 ? _b : new Map();
         const includeOpenOrders = (_c = opts === null || opts === void 0 ? void 0 : opts.includeOpenOrders) !== null && _c !== void 0 ? _c : true;
         // Equivalent to on-chain user_custom_margin_ratio
-        const userCustomMarginRatio = marginCategory === 'Initial' ? this.getUserAccount().maxMarginRatio : 0;
+        const userCustomMarginRatio = marginCategory === 'Initial'
+            ? this.getUserAccountOrThrow().maxMarginRatio
+            : 0;
         // Initialize calc via JS mirror of Rust/on-chain MarginCalculation
         const isolatedMarginBuffers = new Map();
         for (const [marketIndex, isolatedMarginBuffer,] of (_d = opts === null || opts === void 0 ? void 0 : opts.liquidationBufferMap) !== null && _d !== void 0 ? _d : new Map()) {
@@ -2246,11 +2266,11 @@ class User {
             .setIsolatedMarginBuffers(isolatedMarginBuffers);
         const calc = new marginCalculation_1.MarginCalculation(ctx);
         // SPOT POSITIONS
-        for (const spotPosition of this.getUserAccount().spotPositions) {
+        for (const spotPosition of this.getUserAccountOrThrow().spotPositions) {
             if ((0, spotPosition_1.isSpotPositionAvailable)(spotPosition))
                 continue;
             const isQuote = spotPosition.marketIndex === numericConstants_1.QUOTE_SPOT_MARKET_INDEX;
-            const spotMarket = this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex);
+            const spotMarket = this.velocityClient.getSpotMarketAccountOrThrow(spotPosition.marketIndex);
             const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
             const twap5 = strict
                 ? (0, oracles_1.calculateLiveOracleTwap)(spotMarket.historicalOracleData, oraclePriceData, new anchor_1.BN(Math.floor(Date.now() / 1000)), numericConstants_1.FIVE_MINUTE)
@@ -2299,8 +2319,8 @@ class User {
         }
         // PERP POSITIONS
         for (const marketPosition of this.getActivePerpPositions()) {
-            const market = this.velocityClient.getPerpMarketAccount(marketPosition.marketIndex);
-            const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
+            const market = this.velocityClient.getPerpMarketAccountOrThrow(marketPosition.marketIndex);
+            const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(market.quoteSpotMarketIndex);
             const quoteOraclePriceData = this.getOracleDataForSpotMarket(market.quoteSpotMarketIndex);
             const oraclePriceData = this.getMMOracleDataForPerpMarket(market.marketIndex);
             const nonMmmOraclePriceData = this.getOracleDataForPerpMarket(market.marketIndex);
@@ -2353,7 +2373,7 @@ class User {
                 // derive isolated quote deposit value, mirroring on-chain logic
                 let depositValue = numericConstants_1.ZERO;
                 if ((_h = marketPosition.isolatedPositionScaledBalance) === null || _h === void 0 ? void 0 : _h.gt(numericConstants_1.ZERO)) {
-                    const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
+                    const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(market.quoteSpotMarketIndex);
                     const quoteOraclePriceData = this.getOracleDataForSpotMarket(market.quoteSpotMarketIndex);
                     const strictQuote = new strictOraclePrice_1.StrictOraclePrice(quoteOraclePriceData.price, strict
                         ? quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min