flash-sdk 5.0.3 → 6.0.0

package/dist/PerpetualsClient.js

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -659,8 +659,8 @@ var PerpetualsClient = (function () {
                     finalCollateralAmount = swapAmountOut;
                 }
             }
-            var lockedUsd = targetTokenPrice.getAssetAmountUsd(sizeDeltaAmount, targetTokenCustodyAccount.decimals);
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, lockedUsd);
+            var sizeUsd = targetTokenPrice.getAssetAmountUsd(sizeDeltaAmount, targetTokenCustodyAccount.decimals);
+            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, sizeUsd);
             var openFeeUsd = constants_1.BN_ZERO;
             if (sizeDeltaAmount != constants_1.BN_ZERO) {
                 var sizeDeltaUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetTokenCustodyAccount.decimals);
@@ -698,13 +698,13 @@ var PerpetualsClient = (function () {
             if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
                 throw new Error("Delta Amounts cannot be negative.");
             }
-            var lockedUsd = targetPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount, lockedUsd);
+            var sizeUsd = targetPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
+            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount, sizeUsd);
             if (positionAccount === null) {
                 var data = __assign({}, types_1.DEFAULT_POSITION);
                 positionAccount = PositionAccount_1.PositionAccount.from(web3_js_1.PublicKey.default, data);
-                var sizeUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-                positionAccount.sizeUsd = sizeUsd;
+                var sizeUsd_1 = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
+                positionAccount.sizeUsd = sizeUsd_1;
                 positionAccount.sizeDecimals = targetCustodyAccount.decimals;
                 positionAccount.collateralDecimals = collateralCustodyAccount.decimals;
                 positionAccount.lockedDecimals = collateralCustodyAccount.decimals;
@@ -761,13 +761,13 @@ var PerpetualsClient = (function () {
             if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
                 throw new Error("Delta Amounts cannot be negative.");
             }
-            var lockedUsd = targetPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount, lockedUsd);
+            var sizeUsd = targetPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
+            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount, sizeUsd);
             if (positionAccount === null) {
                 var data = __assign({}, types_1.DEFAULT_POSITION);
                 positionAccount = PositionAccount_1.PositionAccount.from(web3_js_1.PublicKey.default, data);
-                var sizeUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-                positionAccount.sizeUsd = sizeUsd;
+                var sizeUsd_2 = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
+                positionAccount.sizeUsd = sizeUsd_2;
                 positionAccount.sizeDecimals = targetCustodyAccount.decimals;
                 positionAccount.collateralDecimals = collateralCustodyAccount.decimals;
                 positionAccount.lockedDecimals = collateralCustodyAccount.decimals;
@@ -831,9 +831,9 @@ var PerpetualsClient = (function () {
                 liquidationPrice: liquidationPrice
             };
         };
-        this.getEntryPriceUsdSync = function (side, targetPrice, targetEmaPrice, targetCustodyAccount, lockedUsd) {
+        this.getEntryPriceUsdSync = function (side, targetPrice, targetEmaPrice, targetCustodyAccount, sizeUsd) {
             var _a = _this.getMinAndMaxOraclePriceSync(targetPrice, targetEmaPrice, targetCustodyAccount), minPrice = _a.min, maxPrice = _a.max;
-            var spread = _this.getTradeSpread(targetCustodyAccount, lockedUsd);
+            var spread = _this.getTradeSpread(targetCustodyAccount, sizeUsd);
             var USD_POWER = (new anchor_1.BN(10)).pow(new anchor_1.BN(constants_1.USD_DECIMALS));
             var entryPriceBN = (0, types_1.isVariant)(side, 'long') ?
                 maxPrice.price.add(maxPrice.price.mul(spread).div(USD_POWER)) :
@@ -866,8 +866,8 @@ var PerpetualsClient = (function () {
             if (resultingPositionAccount.collateralAmount.isNeg() || resultingPositionAccount.sizeAmount.isNeg()) {
                 throw new Error("cannot remove/close more than collateral/Size");
             }
-            var lockedUsd = targetPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-            var exitOraclePrice = _this.getExitOraclePriceSync(side, targetPrice, targetEmaPrice, targetCustodyAccount, lockedUsd);
+            var sizeUsd = targetPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
+            var exitOraclePrice = _this.getExitOraclePriceSync(side, targetPrice, targetEmaPrice, targetCustodyAccount, sizeUsd);
             var _a = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount), collateralTokenMinOraclePrice = _a.min, collateralTokenMaxOraclePrice = _a.max;
             var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(resultingPositionAccount, collateralCustodyAccount, currentTimestamp);
             var lockAndUnsettledFee = collateralTokenMinOraclePrice.getTokenAmount(lockAndUnsettledFeeUsd, collateralCustodyAccount.decimals);
@@ -901,21 +901,21 @@ var PerpetualsClient = (function () {
                 liquidationPrice: liquidationPrice
             };
         };
-        this.getTradeSpread = function (targetCustodyAccount, lockedUsd) {
+        this.getTradeSpread = function (targetCustodyAccount, sizeUsd) {
             if (targetCustodyAccount.pricing.tradeSpreadMax.sub(targetCustodyAccount.pricing.tradeSpreadMin).isZero()
                 ||
-                    lockedUsd.isZero()) {
+                    sizeUsd.isZero()) {
                 return constants_1.BN_ZERO;
             }
             var slope = ((targetCustodyAccount.pricing.tradeSpreadMax.sub(targetCustodyAccount.pricing.tradeSpreadMin)).mul(new anchor_1.BN(Math.pow(10, (constants_1.RATE_DECIMALS + constants_1.BPS_DECIMALS)))))
                 .div(targetCustodyAccount.pricing.maxPositionLockedUsd);
-            var variable = (slope.mul(lockedUsd)).div(new anchor_1.BN(Math.pow(10, (constants_1.RATE_DECIMALS + constants_1.BPS_DECIMALS))));
+            var variable = (slope.mul(sizeUsd)).div(new anchor_1.BN(Math.pow(10, (constants_1.RATE_DECIMALS + constants_1.BPS_DECIMALS))));
             var finalSpread = targetCustodyAccount.pricing.tradeSpreadMin.add(variable);
             return finalSpread;
         };
-        this.getExitOraclePriceSync = function (side, targetPrice, targetEmaPrice, targetCustodyAccount, lockedUsd) {
+        this.getExitOraclePriceSync = function (side, targetPrice, targetEmaPrice, targetCustodyAccount, sizeUsd) {
             var _a = _this.getMinAndMaxOraclePriceSync(targetPrice, targetEmaPrice, targetCustodyAccount), minPrice = _a.min, maxPrice = _a.max;
-            var spread = _this.getTradeSpread(targetCustodyAccount, lockedUsd);
+            var spread = _this.getTradeSpread(targetCustodyAccount, sizeUsd);
             var USD_POWER = (new anchor_1.BN(10)).pow(new anchor_1.BN(constants_1.USD_DECIMALS));
             var exitPriceBN = (0, types_1.isVariant)(side, 'long') ?
                 maxPrice.price.sub(maxPrice.price.mul(spread).div(USD_POWER)) :
@@ -944,7 +944,7 @@ var PerpetualsClient = (function () {
                 openPosFeeRateUi = openPosFeeRateUi.multipliedBy(new bignumber_js_1.default(1).minus(discountBpsUi));
             }
             var sizeUsdUi = collateralAmtMinUsdUi.multipliedBy(leverage)
-                .dividedBy(new bignumber_js_1.default(1).plus(openPosFeeRateUi.multipliedBy(leverage)));
+                .dividedBy(new bignumber_js_1.default(1).plus((new bignumber_js_1.default(2).multipliedBy(openPosFeeRateUi)).multipliedBy(leverage)));
             var lockedUsd = (0, utils_1.uiDecimalsToNative)(sizeUsdUi.toString(), constants_1.USD_DECIMALS);
             var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount, lockedUsd);
             var entryPriceUsdUi = new bignumber_js_1.default(entryOraclePrice.toUiPrice(constants_1.ORACLE_EXPONENT));
@@ -971,7 +971,7 @@ var PerpetualsClient = (function () {
                 openPosFeeRateUi = openPosFeeRateUi.multipliedBy(new bignumber_js_1.default(1).minus(discountBpsUi));
             }
             var sizeUsdUi = collateralAmtMinUsdUi.multipliedBy(leverage)
-                .dividedBy(new bignumber_js_1.default(1).plus(openPosFeeRateUi.multipliedBy(leverage)));
+                .dividedBy(new bignumber_js_1.default(1).plus((new bignumber_js_1.default(2).multipliedBy(openPosFeeRateUi)).multipliedBy(leverage)));
             var lockedUsd = (0, utils_1.uiDecimalsToNative)(sizeUsdUi.toFixed(constants_1.USD_DECIMALS), constants_1.USD_DECIMALS);
             var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, lockedUsd);
             var entryPriceUsdUi = new bignumber_js_1.default(entryOraclePrice.toUiPrice(constants_1.ORACLE_EXPONENT));
@@ -982,8 +982,8 @@ var PerpetualsClient = (function () {
             if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
             var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
-            var lockedUsd = targetPrice.getAssetAmountUsd(sizeAmount, targetCustodyAccount.decimals);
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount, lockedUsd);
+            var sizeUsd = targetPrice.getAssetAmountUsd(sizeAmount, targetCustodyAccount.decimals);
+            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount, sizeUsd);
             var entryPriceUsdUi = new bignumber_js_1.default(entryOraclePrice.toUiPrice(constants_1.ORACLE_EXPONENT));
             var openPosFeeRateUi = new bignumber_js_1.default(targetCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
             if (!discountBps.isZero()) {
@@ -992,20 +992,20 @@ var PerpetualsClient = (function () {
             }
             var sizeAmountUi = new bignumber_js_1.default(sizeAmount.toString()).dividedBy(Math.pow(10, marketToken.decimals));
             var sizeUsdUi = entryPriceUsdUi.multipliedBy(sizeAmountUi);
-            var collateralWithFeeUsdUi = sizeUsdUi.multipliedBy(new bignumber_js_1.default(1).plus(openPosFeeRateUi.multipliedBy(leverage))).dividedBy(leverage);
+            var collateralWithFeeUsdUi = sizeUsdUi.multipliedBy(new bignumber_js_1.default(1).plus((new bignumber_js_1.default(2).multipliedBy(openPosFeeRateUi)).multipliedBy(leverage))).dividedBy(leverage);
             var collateralAmtWithFeeUi = collateralWithFeeUsdUi.dividedBy(collateralTokenMinPriceUi);
             return (0, utils_1.uiDecimalsToNative)(collateralAmtWithFeeUi.toFixed(collateralToken.decimals, bignumber_js_1.default.ROUND_DOWN), collateralToken.decimals);
         };
         this.getCollateralAmountWithSwapSync = function (sizeAmount, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, swapPoolAumUsdMax, poolConfigPosition, poolConfigSwap) {
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount).min;
             var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
-            var lockedUsd = targetTokenPrice.getAssetAmountUsd(sizeAmount, targetTokenCustodyAccount.decimals);
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, lockedUsd);
+            var sizeUsd = targetTokenPrice.getAssetAmountUsd(sizeAmount, targetTokenCustodyAccount.decimals);
+            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, sizeUsd);
             var entryPriceUsdUi = new bignumber_js_1.default(entryOraclePrice.toUiPrice(constants_1.ORACLE_EXPONENT));
             var openPosFeeRateUi = new bignumber_js_1.default(targetTokenCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
             var sizeAmountUi = new bignumber_js_1.default(sizeAmount.toString()).dividedBy(Math.pow(10, targetTokenCustodyAccount.decimals));
             var sizeUsdUi = entryPriceUsdUi.multipliedBy(sizeAmountUi);
-            var collateralWithFeeUsdUi = sizeUsdUi.multipliedBy(new bignumber_js_1.default(1).plus(openPosFeeRateUi.multipliedBy(leverage))).dividedBy(leverage);
+            var collateralWithFeeUsdUi = sizeUsdUi.multipliedBy(new bignumber_js_1.default(1).plus((new bignumber_js_1.default(2).multipliedBy(openPosFeeRateUi)).multipliedBy(leverage))).dividedBy(leverage);
             var collateralAmtWithFeeUi = collateralWithFeeUsdUi.dividedBy(collateralTokenMinPriceUi);
             var collateralAmountWithFee = (0, utils_1.uiDecimalsToNative)(collateralAmtWithFeeUi.toFixed(collateralTokenCustodyAccount.decimals, bignumber_js_1.default.ROUND_DOWN), collateralTokenCustodyAccount.decimals);
             var collateralInInputToken;
@@ -1043,6 +1043,7 @@ var PerpetualsClient = (function () {
             positionDelta.lockedAmount = (positionAccount.lockedAmount.mul(closeRatio)).div(decimalPower);
             positionDelta.lockedUsd = (positionAccount.lockedUsd.mul(closeRatio)).div(decimalPower);
             positionDelta.collateralAmount = (positionAccount.collateralAmount.mul(closeRatio)).div(decimalPower);
+            positionDelta.degenSizeUsd = positionAccount.degenSizeUsd.mul(closeRatio).div(decimalPower);
             var newPnl = _this.getPnlSync(positionDelta, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
             var exitFeeUsd = positionDelta.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             if (discountBps.gt(constants_1.BN_ZERO)) {
@@ -1074,6 +1075,7 @@ var PerpetualsClient = (function () {
             newPosition.collateralAmount = positionAccount.collateralAmount.sub(positionDelta.collateralAmount);
             newPosition.unsettledFeesUsd = positionAccount.unsettledFeesUsd.sub(positionDelta.unsettledFeesUsd);
             newPosition.collateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(newPosition.collateralAmount, collateralCustodyAccount.decimals);
+            newPosition.degenSizeUsd = positionAccount.degenSizeUsd.sub(positionDelta.degenSizeUsd);
             var feeUsdWithDiscount = constants_1.BN_ZERO;
             var feeUsd = sizeDeltaUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             if (discountBps.gt(constants_1.BN_ZERO)) {
@@ -1088,7 +1090,7 @@ var PerpetualsClient = (function () {
             if (keepLevSame) {
                 var collateralAmountReceived = closeAmount;
                 var collateralAmountRecievedUsd = collateralMinMaxPrice.min.getAssetAmountUsd(collateralAmountReceived, collateralCustodyAccount.decimals);
-                var maxWithdrawableAmount = _this.getMaxWithdrawableAmountSyncInternal(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmount);
+                var _a = _this.getMaxWithdrawableAmountSyncInternal(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmount), maxWithdrawableAmount = _a.maxWithdrawableAmount, diff = _a.diff;
                 if (debugLogs) {
                     console.log("maxWithdrawableAmount ", maxWithdrawableAmount.toString(), keepLevSame);
                     console.log("collateralAmountReceived ", collateralAmountReceived.toString(), keepLevSame);
@@ -1118,7 +1120,7 @@ var PerpetualsClient = (function () {
                     newLev: newLev,
                     liquidationPrice: finalLiquidationPrice,
                     collateralAmountRecieved: collateralAmountReceived,
-                    newCollateralAmount: newPosition.collateralAmount,
+                    newCollateralAmount: newPosition.collateralAmount.add(diff),
                     newPnl: finalPnlUsd
                 };
             }
@@ -1132,29 +1134,36 @@ var PerpetualsClient = (function () {
             if (errorBandwidthPercentageUi > 100 || errorBandwidthPercentageUi < 0) {
                 throw new Error("errorBandwidthPercentageUi cannot be >100 or <0");
             }
-            var MAX_INIT_LEVERAGE = targetCustodyAccount.pricing.maxInitialLeverage.mul(new anchor_1.BN(100 - errorBandwidthPercentageUi)).div(new anchor_1.BN(100));
+            var MAX_INIT_LEVERAGE = positionAccount.isDegenMode() ?
+                (new anchor_1.BN(targetCustodyAccount.pricing.maxInitDegenLeverage)).mul(new anchor_1.BN(100 - errorBandwidthPercentageUi)).div(new anchor_1.BN(100))
+                : (new anchor_1.BN(targetCustodyAccount.pricing.maxInitLeverage)).mul(new anchor_1.BN(100 - errorBandwidthPercentageUi)).div(new anchor_1.BN(100));
             var profitLoss = _this.getPnlSync(positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
             var _a = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount), collateralMinPrice = _a.min, collateralMaxPrice = _a.max;
+            var exitFeeUsd = positionAccount.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
+            var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
+            var lossUsd = profitLoss.lossUsd.add(exitFeeUsd).add(lockAndUnsettledFeeUsd);
             var currentCollateralUsd = collateralMinPrice.getAssetAmountUsd(positionAccount.collateralAmount.add(closeAmount), collateralCustodyAccount.decimals);
             var availableInitMarginUsd = constants_1.BN_ZERO;
             if (profitLoss.lossUsd.lt(currentCollateralUsd)) {
-                availableInitMarginUsd = currentCollateralUsd.sub(profitLoss.lossUsd);
+                availableInitMarginUsd = currentCollateralUsd.sub(lossUsd);
             }
             else {
                 console.log("profitLoss.lossUsd > coll :: should have been liquidated");
-                return constants_1.BN_ZERO;
+                return { maxWithdrawableAmount: constants_1.BN_ZERO, diff: constants_1.BN_ZERO };
             }
             var maxRemovableCollateralUsd = availableInitMarginUsd.sub(positionAccount.sizeUsd.muln(constants_1.BPS_POWER).div(MAX_INIT_LEVERAGE));
             if (maxRemovableCollateralUsd.isNeg()) {
-                return constants_1.BN_ZERO;
+                return { maxWithdrawableAmount: constants_1.BN_ZERO, diff: constants_1.BN_ZERO };
             }
             var maxWithdrawableAmount;
+            var diff;
             var remainingCollateralUsd = availableInitMarginUsd.sub(maxRemovableCollateralUsd);
-            if (remainingCollateralUsd < targetCustodyAccount.pricing.minCollateralUsd) {
-                var diff = targetCustodyAccount.pricing.minCollateralUsd.sub(remainingCollateralUsd);
+            var isDegenMode = positionAccount.isDegenMode();
+            if (remainingCollateralUsd.lt(new anchor_1.BN(isDegenMode ? targetCustodyAccount.pricing.minDegenCollateralUsd : targetCustodyAccount.pricing.minCollateralUsd))) {
+                diff = (new anchor_1.BN(isDegenMode ? targetCustodyAccount.pricing.minDegenCollateralUsd : targetCustodyAccount.pricing.minCollateralUsd)).sub(remainingCollateralUsd);
                 var updatedMaxRemovableCollateralUsd = maxRemovableCollateralUsd.sub(diff);
                 if (updatedMaxRemovableCollateralUsd.isNeg()) {
-                    return constants_1.BN_ZERO;
+                    return { maxWithdrawableAmount: constants_1.BN_ZERO, diff: constants_1.BN_ZERO };
                 }
                 else {
                     maxWithdrawableAmount = collateralMaxPrice.getTokenAmount(updatedMaxRemovableCollateralUsd, collateralCustodyAccount.decimals);
@@ -1163,7 +1172,7 @@ var PerpetualsClient = (function () {
             else {
                 maxWithdrawableAmount = collateralMaxPrice.getTokenAmount(maxRemovableCollateralUsd, collateralCustodyAccount.decimals);
             }
-            return maxWithdrawableAmount;
+            return { maxWithdrawableAmount: maxWithdrawableAmount, diff: diff };
         };
         this.getFinalCloseAmountSync = function (positionAccount, marketCorrelation, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig) {
             var position = PositionAccount_1.PositionAccount.from(positionAccount.publicKey, __assign({}, positionAccount));
@@ -1190,18 +1199,23 @@ var PerpetualsClient = (function () {
             if (errorBandwidthPercentageUi > 100 || errorBandwidthPercentageUi < 0) {
                 throw new Error("errorBandwidthPercentageUi cannot be >100 or <0");
             }
-            var MAX_INIT_LEVERAGE = targetCustodyAccount.pricing.maxInitialLeverage.mul(new anchor_1.BN(100 - errorBandwidthPercentageUi)).div(new anchor_1.BN(100));
-            var maxRemoveableCollateralUsdAfterMinRequired = positionAccount.collateralUsd.sub(targetCustodyAccount.pricing.minCollateralUsd.mul(new anchor_1.BN(100 + errorBandwidthPercentageUi)).div(new anchor_1.BN(100)));
+            var MAX_INIT_LEVERAGE = positionAccount.isDegenMode() ?
+                (new anchor_1.BN(targetCustodyAccount.pricing.maxInitDegenLeverage)).mul(new anchor_1.BN(100 - errorBandwidthPercentageUi)).div(new anchor_1.BN(100))
+                : (new anchor_1.BN(targetCustodyAccount.pricing.maxInitLeverage)).mul(new anchor_1.BN(100 - errorBandwidthPercentageUi)).div(new anchor_1.BN(100));
+            var maxRemoveableCollateralUsdAfterMinRequired = positionAccount.collateralUsd.sub((positionAccount.isDegenMode() ? new anchor_1.BN(targetCustodyAccount.pricing.minDegenCollateralUsd) : new anchor_1.BN(targetCustodyAccount.pricing.minCollateralUsd)).mul(new anchor_1.BN(100 + errorBandwidthPercentageUi)).div(new anchor_1.BN(100)));
             if (maxRemoveableCollateralUsdAfterMinRequired.isNeg()) {
                 console.log("THIS cannot happen but still");
                 return constants_1.BN_ZERO;
             }
             var profitLoss = _this.getPnlSync(positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
             var _a = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount), collateralMinPrice = _a.min, collateralMaxPrice = _a.max;
+            var exitFeeUsd = positionAccount.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
+            var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
+            var lossUsd = profitLoss.lossUsd.add(exitFeeUsd).add(lockAndUnsettledFeeUsd);
             var currentCollateralUsd = collateralMinPrice.getAssetAmountUsd(positionAccount.collateralAmount, collateralCustodyAccount.decimals);
             var availableInitMarginUsd = constants_1.BN_ZERO;
             if (profitLoss.lossUsd.lt(currentCollateralUsd)) {
-                availableInitMarginUsd = currentCollateralUsd.sub(profitLoss.lossUsd);
+                availableInitMarginUsd = currentCollateralUsd.sub(lossUsd);
             }
             else {
                 console.log("profitLoss.lossUsd > coll :: should have been liquidated");
@@ -1241,11 +1255,11 @@ var PerpetualsClient = (function () {
                 borrowRate = (currentUtilization.mul(custodyAccount.borrowRate.slope1))
                     .div(custodyAccount.borrowRate.optimalUtilization);
             }
-            else if (currentUtilization.lt(custodyAccount.pricing.maxUtilization)) {
+            else if (currentUtilization.lt((new anchor_1.BN(custodyAccount.pricing.maxUtilization)))) {
                 borrowRate = custodyAccount.borrowRate.slope1
                     .add(currentUtilization.sub(custodyAccount.borrowRate.optimalUtilization)
                     .mul(custodyAccount.borrowRate.slope2)
-                    .div(custodyAccount.pricing.maxUtilization.sub(custodyAccount.borrowRate.optimalUtilization)));
+                    .div((new anchor_1.BN(custodyAccount.pricing.maxUtilization)).sub(custodyAccount.borrowRate.optimalUtilization)));
             }
             else {
                 borrowRate = custodyAccount.borrowRate.slope1.add(custodyAccount.borrowRate.slope2);
@@ -1287,7 +1301,7 @@ var PerpetualsClient = (function () {
             }
             var exitFeeUsd = positionAccount.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             var unsettledLossUsd = exitFeeUsd.add(lockAndUnsettledFeeUsd);
-            var liablitiesUsd = positionAccount.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(targetCustodyAccount.pricing.maxLeverage).add(unsettledLossUsd);
+            var liablitiesUsd = positionAccount.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(new anchor_1.BN(targetCustodyAccount.pricing.maxLeverage)).add(unsettledLossUsd);
             var targetMinMaxPriceOracle = _this.getMinAndMaxOraclePriceSync(targetPrice, targetEmaPrice, targetCustodyAccount);
             var collateralMinMaxPriceOracle = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
             var liquidationPrice;
@@ -1377,7 +1391,7 @@ var PerpetualsClient = (function () {
             }
             var exitFeeUsd = sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             var unsettledLossUsd = exitFeeUsd;
-            var liablitiesUsd = sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(targetCustodyAccount.pricing.maxLeverage).add(unsettledLossUsd);
+            var liablitiesUsd = sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(new anchor_1.BN(targetCustodyAccount.pricing.maxLeverage)).add(unsettledLossUsd);
             var targetMinMaxPriceOracle = _this.getMinAndMaxOraclePriceSync(targetPrice, targetEmaPrice, targetCustodyAccount);
             var collateralMinMaxPriceOracle = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
             var liquidationPrice;
@@ -1498,8 +1512,8 @@ var PerpetualsClient = (function () {
             if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
                 throw new Error("Delta Amounts cannot be negative.");
             }
-            var lockedUsd = targetTokenEmaPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, lockedUsd);
+            var sizeUsd = targetTokenEmaPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
+            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, sizeUsd);
             if (positionAccount === null) {
                 var data = __assign({}, types_1.DEFAULT_POSITION);
                 positionAccount = PositionAccount_1.PositionAccount.from(web3_js_1.PublicKey.default, data);
@@ -1606,8 +1620,8 @@ var PerpetualsClient = (function () {
                 };
             }
             var side = poolConfig.getMarketConfigByPk(positionAccount.market).side;
-            var lockedUsd = targetTokenPrice.getAssetAmountUsd(positionAccount.sizeAmount, targetCustodyAccount.decimals);
-            var exitOraclePrice = _this.getExitOraclePriceSync(side, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, lockedUsd);
+            var sizeUsd = targetTokenPrice.getAssetAmountUsd(positionAccount.sizeAmount, targetCustodyAccount.decimals);
+            var exitOraclePrice = _this.getExitOraclePriceSync(side, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, sizeUsd);
             var collateralMinPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
             var priceDiffProfit, priceDiffLoss;
             var positionEntryPrice = OraclePrice_1.OraclePrice.from({
@@ -5958,143 +5972,13 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.setTriggerPrice = function (targetSymbol, collateralSymbol, side, triggerPrice, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, positionAccount, instructions, additionalSigners, setTriggerPrice, err_36;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        publicKey = this.provider.wallet.publicKey;
-                        targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
-                        collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                        marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
-                        positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
-                        instructions = [];
-                        additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4, this.program.methods
-                                .setTriggerPrice({
-                                triggerPrice: triggerPrice,
-                                isStopLoss: isStopLoss
-                            })
-                                .accounts({
-                                owner: publicKey,
-                                perpetuals: this.perpetuals.publicKey,
-                                pool: poolConfig.poolAddress,
-                                position: positionAccount,
-                                market: marketAccount,
-                                targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
-                                collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                            })
-                                .instruction()];
-                    case 2:
-                        setTriggerPrice = _a.sent();
-                        instructions.push(setTriggerPrice);
-                        return [3, 4];
-                    case 3:
-                        err_36 = _a.sent();
-                        console.log("perpClient setTriggerPrice error:: ", err_36);
-                        throw err_36;
-                    case 4: return [2, {
-                            instructions: __spreadArray([], instructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
-        this.forceClosePosition = function (positionAccount_2, targetSymbol_1, collateralSymbol_1, side_1, isStopLoss_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 6; _i < arguments.length; _i++) {
-                args_1[_i - 6] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([positionAccount_2, targetSymbol_1, collateralSymbol_1, side_1, isStopLoss_1, poolConfig_1], args_1, true), void 0, function (positionAccount, targetSymbol, collateralSymbol, side, isStopLoss, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, forceClosePosition, closeWsolATAIns, err_37;
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            payerPubkey = this.provider.wallet.publicKey;
-                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
-                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
-                            preInstructions = [];
-                            instructions = [];
-                            postInstructions = [];
-                            additionalSigners = [];
-                            _b.label = 1;
-                        case 1:
-                            _b.trys.push([1, 5, , 6]);
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, positionAccount.owner, false, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                            _a = createUserATA;
-                            if (!_a) return [3, 3];
-                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 2:
-                            _a = !(_b.sent());
-                            _b.label = 3;
-                        case 3:
-                            if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, positionAccount.owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
-                            }
-                            return [4, this.program.methods
-                                    .forceClosePosition({
-                                    privilege: types_1.Privilege.None,
-                                    isStopLoss: isStopLoss
-                                })
-                                    .accounts({
-                                    owner: positionAccount.owner,
-                                    receivingAccount: userReceivingTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: this.perpetuals.publicKey,
-                                    pool: poolConfig.poolAddress,
-                                    position: positionAccount.publicKey,
-                                    market: marketAccount,
-                                    targetCustody: targetCustodyConfig.custodyAccount,
-                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
-                                    collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
-                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    receivingMint: collateralCustodyConfig.mintKey
-                                })
-                                    .instruction()];
-                        case 4:
-                            forceClosePosition = _b.sent();
-                            instructions.push(forceClosePosition);
-                            if (collateralSymbol == 'WSOL' && closeUsersWSOLATA) {
-                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, positionAccount.owner, positionAccount.owner);
-                                postInstructions.push(closeWsolATAIns);
-                            }
-                            return [3, 6];
-                        case 5:
-                            err_37 = _b.sent();
-                            console.log("perpClient forceClosePosition error:: ", err_37);
-                            throw err_37;
-                        case 6: return [2, {
-                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                                additionalSigners: additionalSigners
-                            }];
-                    }
-                });
-            });
-        };
         this.placeLimitOrder = function (targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, limitPrice_1, reserveAmount_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1) {
             var args_1 = [];
             for (var _i = 11; _i < arguments.length; _i++) {
                 args_1[_i - 11] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, limitPrice_1, reserveAmount_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, limitPrice, reserveAmount, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_38;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_36;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
@@ -6200,9 +6084,9 @@ var PerpetualsClient = (function () {
                             instructions.push(placeLimitOrder);
                             return [3, 10];
                         case 9:
-                            err_38 = _c.sent();
-                            console.log("perpClient placeLimitOrder error:: ", err_38);
-                            throw err_38;
+                            err_36 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_36);
+                            throw err_36;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6217,7 +6101,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 11] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, orderId_1, limitPrice_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey) {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_39;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_37;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_b) {
@@ -6308,9 +6192,9 @@ var PerpetualsClient = (function () {
                             instructions.push(editLimitOrder);
                             return [3, 8];
                         case 7:
-                            err_39 = _b.sent();
-                            console.log("perpClient editLimitOrder error:: ", err_39);
-                            throw err_39;
+                            err_37 = _b.sent();
+                            console.log("perpClient editLimitOrder error:: ", err_37);
+                            throw err_37;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6325,7 +6209,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 7] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([userPubkey_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, poolConfig_1, privilege_1], args_1, true), void 0, function (userPubkey, targetSymbol, collateralSymbol, side, orderId, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_40;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_38;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
                 if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
@@ -6378,9 +6262,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitOrder);
                             return [3, 4];
                         case 3:
-                            err_40 = _a.sent();
-                            console.log("perpClient executeLimitOrder error:: ", err_40);
-                            throw err_40;
+                            err_38 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_38);
+                            throw err_38;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6395,7 +6279,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 8] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([userPubkey_1, targetSymbol_1, collateralSymbol_1, reserveSymbol_1, side_1, orderId_1, poolConfig_1, privilege_1], args_1, true), void 0, function (userPubkey, targetSymbol, collateralSymbol, reserveSymbol, side, orderId, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitWithSwap, err_41;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitWithSwap, err_39;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
                 if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
@@ -6451,9 +6335,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitWithSwap);
                             return [3, 4];
                         case 3:
-                            err_41 = _a.sent();
-                            console.log("perpClient executeLimitWithSwap error:: ", err_41);
-                            throw err_41;
+                            err_39 = _a.sent();
+                            console.log("perpClient executeLimitWithSwap error:: ", err_39);
+                            throw err_39;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6463,7 +6347,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.placeTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_42;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_40;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6511,9 +6395,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_42 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_42);
-                        throw err_42;
+                        err_40 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_40);
+                        throw err_40;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6522,7 +6406,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.editTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_43;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_41;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6569,9 +6453,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_43 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_43);
-                        throw err_43;
+                        err_41 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_41);
+                        throw err_41;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6580,7 +6464,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_44;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_42;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6613,9 +6497,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_44 = _a.sent();
-                        console.log("perpClient cancelTriggerOrder error:: ", err_44);
-                        throw err_44;
+                        err_42 = _a.sent();
+                        console.log("perpClient cancelTriggerOrder error:: ", err_42);
+                        throw err_42;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6624,7 +6508,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelAllTriggerOrders = function (targetSymbol, collateralSymbol, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_45;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_43;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6655,9 +6539,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelAllTriggerOrders);
                         return [3, 4];
                     case 3:
-                        err_45 = _a.sent();
-                        console.log("perpClient cancelAllTriggerOrders error:: ", err_45);
-                        throw err_45;
+                        err_43 = _a.sent();
+                        console.log("perpClient cancelAllTriggerOrders error:: ", err_43);
+                        throw err_43;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6671,7 +6555,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 9] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, targetSymbol_1, collateralSymbol_1, receivingSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1], args_1, true), void 0, function (owner, targetSymbol, collateralSymbol, receivingSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, collateralToken, receivingToken, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _c, _d, custody, executeTriggerWithSwap, err_46;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, collateralToken, receivingToken, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _c, _d, custody, executeTriggerWithSwap, err_44;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
@@ -6778,9 +6662,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerWithSwap);
                             return [3, 10];
                         case 9:
-                            err_46 = _e.sent();
-                            console.log("perpClient executeTriggerWithSwap error:: ", err_46);
-                            throw err_46;
+                            err_44 = _e.sent();
+                            console.log("perpClient executeTriggerWithSwap error:: ", err_44);
+                            throw err_44;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6795,7 +6679,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 8] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1], args_1, true), void 0, function (owner, targetSymbol, collateralSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_47;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_45;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
@@ -6867,9 +6751,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerOrder);
                             return [3, 8];
                         case 7:
-                            err_47 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_47);
-                            throw err_47;
+                            err_45 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_45);
+                            throw err_45;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6878,54 +6762,13 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.migrateTriggerOrder = function (owner, marketAccount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var payerPubkey, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_48;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        payerPubkey = this.provider.wallet.publicKey;
-                        preInstructions = [];
-                        instructions = [];
-                        postInstructions = [];
-                        additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        positionAccount = poolConfig.getPositionFromMarketPk(owner, marketAccount);
-                        orderAccount = poolConfig.getOrderFromMarketPk(owner, marketAccount);
-                        return [4, this.program.methods
-                                .migrateTriggerOrder()
-                                .accounts({
-                                owner: owner,
-                                feePayer: payerPubkey,
-                                position: positionAccount,
-                                order: orderAccount,
-                                market: marketAccount,
-                                systemProgram: web3_js_1.SystemProgram.programId,
-                            })
-                                .instruction()];
-                    case 2:
-                        migrateTriggerOrder = _a.sent();
-                        instructions.push(migrateTriggerOrder);
-                        return [3, 4];
-                    case 3:
-                        err_48 = _a.sent();
-                        console.log("perpClient migrateTriggerOrder error:: ", err_48);
-                        throw err_48;
-                    case 4: return [2, {
-                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
         this.swap = function (userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1) {
             var args_1 = [];
             for (var _i = 5; _i < arguments.length; _i++) {
                 args_1[_i - 5] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1], args_1, true), void 0, function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks, ephemeralSignerPubkey) {
-                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _e, _f, custody, params, inx, closeWsolATAIns, err_49;
+                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _e, _f, custody, params, inx, closeWsolATAIns, err_46;
                 if (useFeesPool === void 0) { useFeesPool = false; }
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (unWrapSol === void 0) { unWrapSol = false; }
@@ -7130,9 +6973,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 20];
                         case 19:
-                            err_49 = _g.sent();
-                            console.error("perpClient Swap error:: ", err_49);
-                            throw err_49;
+                            err_46 = _g.sent();
+                            console.error("perpClient Swap error:: ", err_46);
+                            throw err_46;
                         case 20: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -7142,7 +6985,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.swapFeeInternal = function (rewardTokenSymbol, swapTokenSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_50;
+            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_47;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -7202,9 +7045,9 @@ var PerpetualsClient = (function () {
                         instructions.push(inx);
                         return [3, 4];
                     case 3:
-                        err_50 = _b.sent();
-                        console.error("perpClient Swap error:: ", err_50);
-                        throw err_50;
+                        err_47 = _b.sent();
+                        console.error("perpClient Swap error:: ", err_47);
+                        throw err_47;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7213,7 +7056,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setLpTokenPrice = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, setLpTokenPriceInstruction, err_51;
+            var instructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, setLpTokenPriceInstruction, err_48;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -7261,9 +7104,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setLpTokenPriceInstruction);
                         return [3, 4];
                     case 3:
-                        err_51 = _d.sent();
-                        console.log("perpClient setLpTokenPriceInstruction error:: ", err_51);
-                        throw err_51;
+                        err_48 = _d.sent();
+                        console.log("perpClient setLpTokenPriceInstruction error:: ", err_48);
+                        throw err_48;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7311,7 +7154,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setAdminSigners = function (admins, minSignatures) { return __awaiter(_this, void 0, void 0, function () {
-            var adminMetas, _i, admins_2, admin, err_52;
+            var adminMetas, _i, admins_2, admin, err_49;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7341,11 +7184,11 @@ var PerpetualsClient = (function () {
                         _a.sent();
                         return [3, 4];
                     case 3:
-                        err_52 = _a.sent();
+                        err_49 = _a.sent();
                         if (this.printErrors) {
-                            console.error("setAdminSigners err:", err_52);
+                            console.error("setAdminSigners err:", err_49);
                         }
-                        throw err_52;
+                        throw err_49;
                     case 4: return [2];
                 }
             });
@@ -7534,7 +7377,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.protocolWithdrawFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_53;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_50;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7567,9 +7410,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_53 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_53);
-                        throw err_53;
+                        err_50 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_50);
+                        throw err_50;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7578,7 +7421,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.moveProtocolFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_54;
+            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_51;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7612,9 +7455,9 @@ var PerpetualsClient = (function () {
                         instructions.push(moveProtocolFeesIx);
                         return [3, 4];
                     case 3:
-                        err_54 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_54);
-                        throw err_54;
+                        err_51 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_51);
+                        throw err_51;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7623,7 +7466,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setProtocolFeeShareBps = function (feeShareBps, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, setProtocolFeeShareBpsIx, err_55;
+            var publicKey, setProtocolFeeShareBpsIx, err_52;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7643,15 +7486,15 @@ var PerpetualsClient = (function () {
                         setProtocolFeeShareBpsIx = _a.sent();
                         return [2, setProtocolFeeShareBpsIx];
                     case 2:
-                        err_55 = _a.sent();
-                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_55);
-                        throw err_55;
+                        err_52 = _a.sent();
+                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_52);
+                        throw err_52;
                     case 3: return [2];
                 }
             });
         }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_56;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_53;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7678,9 +7521,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_56 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_56);
-                        throw err_56;
+                        err_53 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_53);
+                        throw err_53;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7689,7 +7532,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.reimburse = function (tokenMint, amountIn, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_57;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_54;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -7750,9 +7593,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_57 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_57);
-                        throw err_57;
+                        err_54 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_54);
+                        throw err_54;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7761,7 +7604,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalOraclePrice = function (tokenMint, price, expo, conf, ema, publishTime, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_58;
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_55;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7794,9 +7637,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_58 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_58);
-                        throw err_58;
+                        err_55 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_55);
+                        throw err_55;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7805,7 +7648,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalOraclePriceBatch = function (tokenMintList, tokenInternalPrices, POOL_CONFIGS) { return __awaiter(_this, void 0, void 0, function () {
-            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_1, _i, tokenMintList_1, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_59;
+            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_1, _i, tokenMintList_1, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_56;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7855,9 +7698,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_59 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_59);
-                        throw err_59;
+                        err_56 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_56);
+                        throw err_56;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7866,7 +7709,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalOracleEmaPriceBatch = function (tokenMintList, tokenInternalEmaPrices, POOL_CONFIGS) { return __awaiter(_this, void 0, void 0, function () {
-            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_2, _i, tokenMintList_2, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_60;
+            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_2, _i, tokenMintList_2, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_57;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7916,9 +7759,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_60 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_60);
-                        throw err_60;
+                        err_57 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_57);
+                        throw err_57;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7927,7 +7770,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.renameFlp = function (flag, lpTokenName, lpTokenSymbol, lpTokenUri, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_61;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_58;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7965,8 +7808,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_61 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_61);
+                        err_58 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_58);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -7976,7 +7819,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initStake = function (stakingFeeShareBps, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_62;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_59;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8014,9 +7857,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_62 = _a.sent();
-                        console.log("perpClient InitStaking error:: ", err_62);
-                        throw err_62;
+                        err_59 = _a.sent();
+                        console.log("perpClient InitStaking error:: ", err_59);
+                        throw err_59;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8025,7 +7868,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initCompounding = function (feeShareBps, metadataTitle, metadataSymbol, metadataUri, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_63;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_60;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8070,9 +7913,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initCompoundingInstruction);
                         return [3, 4];
                     case 3:
-                        err_63 = _a.sent();
-                        console.log("perpClient initCompounding error:: ", err_63);
-                        throw err_63;
+                        err_60 = _a.sent();
+                        console.log("perpClient initCompounding error:: ", err_60);
+                        throw err_60;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8081,7 +7924,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initTokenVault = function (token_permissions, tokens_to_distribute, withdrawTimeLimit, withdrawInstantFee, stakeLevel, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_64;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_61;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8122,9 +7965,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initTokenVaultInstruction);
                         return [3, 4];
                     case 3:
-                        err_64 = _a.sent();
-                        console.log("perpClient InitTokenVaultInstruction error:: ", err_64);
-                        throw err_64;
+                        err_61 = _a.sent();
+                        console.log("perpClient InitTokenVaultInstruction error:: ", err_61);
+                        throw err_61;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8133,7 +7976,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenVaultConfig = function (token_permissions, withdrawTimeLimit, withdrawInstantFee, stakeLevel, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_65;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_62;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8164,9 +8007,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenVaultConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_65 = _a.sent();
-                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_65);
-                        throw err_65;
+                        err_62 = _a.sent();
+                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_62);
+                        throw err_62;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8175,7 +8018,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawInstantFee = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_66;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_63;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8214,9 +8057,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawInstantFeeInstruction);
                         return [3, 6];
                     case 5:
-                        err_66 = _a.sent();
-                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_66);
-                        throw err_66;
+                        err_63 = _a.sent();
+                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_63);
+                        throw err_63;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8225,7 +8068,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRevenueTokenAccount = function (feeShareBps, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_67;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_64;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8262,9 +8105,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRevenueTokenAccountInstruction);
                         return [3, 4];
                     case 3:
-                        err_67 = _a.sent();
-                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_67);
-                        throw err_67;
+                        err_64 = _a.sent();
+                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_64);
+                        throw err_64;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8273,7 +8116,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.distributeTokenReward = function (amount, epochCount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_68;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_65;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8312,9 +8155,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_68 = _a.sent();
-                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_68);
-                        throw err_68;
+                        err_65 = _a.sent();
+                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_65);
+                        throw err_65;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8323,7 +8166,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenStakeLevel = function (owner, stakeLevel) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_69;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_66;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8351,9 +8194,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenStakeLevelInstruction);
                         return [3, 4];
                     case 3:
-                        err_69 = _a.sent();
-                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_69);
-                        throw err_69;
+                        err_66 = _a.sent();
+                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_66);
+                        throw err_66;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8362,7 +8205,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenReward = function (owner, amount, epochCount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_70;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_67;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8394,9 +8237,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_70 = _a.sent();
-                        console.log("perpClient setTokenRewardInstruction error:: ", err_70);
-                        throw err_70;
+                        err_67 = _a.sent();
+                        console.log("perpClient setTokenRewardInstruction error:: ", err_67);
+                        throw err_67;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners