flash-sdk 9.0.1 → 9.0.2-alpha.1

package/dist/PerpetualsClient.js

@@ -638,24 +638,41 @@ var PerpetualsClient = (function () {
             var averageEntryPrice = totalValue.div(totalSize);
             return averageEntryPrice;
         };
-        this.getLeverageSync = function (sizeUsd, collateralAmount, collateralMinOraclePrice, collateralTokenDecimals, pnlUsd) {
-            var currentCollateralUsd = collateralMinOraclePrice.getAssetAmountUsd(collateralAmount, collateralTokenDecimals);
-            var currentCollateralUsdIncludingPnl = currentCollateralUsd.add(pnlUsd);
-            if (currentCollateralUsdIncludingPnl.gt(constants_1.BN_ZERO)) {
-                return sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentCollateralUsdIncludingPnl);
+        this.getLeverageContractHelper = function (positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, isInitial, poolConfig) {
+            var pnl = _this.getPnlSync(positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
+            var exitFee = _this.getExitFeeSync(positionAccount, targetCustodyAccount, collateralCustodyAccount, collateralPrice, collateralEmaPrice);
+            var lockFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
+            var unsettledFeesUsd = exitFee.exitFeeUsd.add(lockFeeUsd);
+            var lossUsd = pnl.lossUsd.add(unsettledFeesUsd);
+            var currentMarginUsd = constants_1.BN_ZERO;
+            if (isInitial) {
+                currentMarginUsd = positionAccount.collateralUsd.sub(lossUsd);
+            }
+            else {
+                currentMarginUsd = positionAccount.collateralUsd.add(pnl.profitUsd).sub(lossUsd);
+            }
+            if (currentMarginUsd.gt(constants_1.BN_ZERO)) {
+                return positionAccount.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentMarginUsd);
             }
             else {
                 return new anchor_1.BN(Number.MAX_SAFE_INTEGER);
             }
         };
-        this.getLeverageAtAmountEntryWithSwapSync = function (positionAccount, inputDeltaAmount, sizeDeltaAmount, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, swapPoolAumUsdMax, poolConfigPosition, poolConfigSwap, pnlUsd) {
+        this.getLeverageSync = function (positionAccount, finalCollateralUsd, finalSizeUsd, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, isInitial, poolConfig) {
+            positionAccount = positionAccount.clone();
+            positionAccount.sizeUsd = finalSizeUsd;
+            positionAccount.sizeAmount = targetPrice.getTokenAmount(finalSizeUsd, targetCustodyAccount.decimals);
+            positionAccount.collateralUsd = finalCollateralUsd;
+            return _this.getLeverageContractHelper(positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, isInitial, poolConfig);
+        };
+        this.getLeverageAtAmountEntryWithSwapSync = function (positionAccount, inputDeltaAmount, sizeDeltaAmount, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, swapPoolAumUsdMax, poolConfig, pnlUsd) {
             var finalCollateralAmount = constants_1.BN_ZERO;
             if (!inputDeltaAmount.isZero()) {
                 if (inputTokenCustodyAccount.publicKey.equals(collateralTokenCustodyAccount.publicKey)) {
                     finalCollateralAmount = inputDeltaAmount;
                 }
                 else {
-                    var swapAmountOut = _this.getSwapAmountAndFeesSync(inputDeltaAmount, constants_1.BN_ZERO, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, swapPoolAumUsdMax, poolConfigSwap).minAmountOut;
+                    var swapAmountOut = _this.getSwapAmountAndFeesSync(inputDeltaAmount, constants_1.BN_ZERO, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, swapPoolAumUsdMax, poolConfig).minAmountOut;
                     finalCollateralAmount = swapAmountOut;
                 }
             }
@@ -681,9 +698,8 @@ var PerpetualsClient = (function () {
                 entryOraclePrice.price = _this.getAveragePriceSync(positionEntryPrice.price, positionAccount.sizeAmount, entryOraclePrice.price, sizeDeltaAmount);
             }
             var collateralMinOraclePrice = _this.getMinAndMaxOraclePriceSync(collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount).min;
-            var collateralAmount = positionAccount.collateralAmount.add(finalCollateralAmount);
-            var currentCollateralUsd = collateralMinOraclePrice.getAssetAmountUsd(collateralAmount, collateralTokenCustodyAccount.decimals);
-            var currentCollateralUsdIncludingPnl = currentCollateralUsd.add(pnlUsd).sub(openFeeUsd);
+            var finalCollateralUsd = collateralMinOraclePrice.getAssetAmountUsd(finalCollateralAmount, collateralTokenCustodyAccount.decimals);
+            var currentCollateralUsdIncludingPnl = finalCollateralUsd.add(pnlUsd).sub(openFeeUsd);
             var sizeAmount = positionAccount.sizeAmount.add(sizeDeltaAmount);
             var sizeAmountUsd = entryOraclePrice.getAssetAmountUsd(sizeAmount, targetTokenCustodyAccount.decimals);
             if (currentCollateralUsdIncludingPnl.gt(constants_1.BN_ZERO)) {
@@ -693,68 +709,6 @@ var PerpetualsClient = (function () {
                 return new anchor_1.BN(Number.MAX_SAFE_INTEGER);
             }
         };
-        this.getEntryPriceAndFeeSync = function (positionAccount, marketCorrelation, collateralDeltaAmount, sizeDeltaAmount, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, discountBps) {
-            if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
-            if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
-                throw new Error("Delta Amounts cannot be negative.");
-            }
-            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_1 = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-                positionAccount.sizeUsd = sizeUsd_1;
-                positionAccount.sizeDecimals = targetCustodyAccount.decimals;
-                positionAccount.collateralDecimals = collateralCustodyAccount.decimals;
-                positionAccount.lockedDecimals = collateralCustodyAccount.decimals;
-            }
-            else {
-                positionAccount = positionAccount.clone();
-                var positionEntryPrice = OraclePrice_1.OraclePrice.from({
-                    price: positionAccount.entryPrice.price,
-                    exponent: new anchor_1.BN(positionAccount.entryPrice.exponent),
-                    confidence: constants_1.BN_ZERO,
-                    timestamp: constants_1.BN_ZERO
-                });
-                entryOraclePrice.price = _this.getAveragePriceSync(positionEntryPrice.price, positionAccount.sizeAmount, entryOraclePrice.price, sizeDeltaAmount);
-                var sizeDeltaUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-                positionAccount.sizeUsd = positionAccount.sizeUsd.add(sizeDeltaUsd);
-            }
-            positionAccount.collateralAmount = positionAccount.collateralAmount.add(collateralDeltaAmount);
-            positionAccount.sizeAmount = positionAccount.sizeAmount.add(sizeDeltaAmount);
-            var lockFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
-            var liquidationPrice = _this.getLiquidationPriceSync(positionAccount.collateralAmount, positionAccount.sizeAmount, entryOraclePrice, lockFeeUsd, marketCorrelation, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount);
-            var sizeAmountUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-            var collateralTokenMinOraclePrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
-            var feeUsd = constants_1.BN_ZERO;
-            var feeAmount = constants_1.BN_ZERO;
-            var feeUsdAfterDiscount = constants_1.BN_ZERO;
-            var feeAmountAfterDiscount = constants_1.BN_ZERO;
-            if (positionAccount !== null && sizeDeltaAmount.isZero()) {
-            }
-            else {
-                feeUsd = sizeAmountUsd.mul(targetCustodyAccount.fees.openPosition).div(new anchor_1.BN(constants_1.RATE_POWER));
-                feeAmount = feeUsd.mul(new anchor_1.BN(Math.pow(10, collateralCustodyAccount.decimals))).div(collateralTokenMinOraclePrice.price);
-                if (discountBps.gt(constants_1.BN_ZERO)) {
-                    feeUsdAfterDiscount = feeUsd.mul(discountBps).div(new anchor_1.BN(constants_1.BPS_POWER));
-                    feeUsdAfterDiscount = feeUsd.sub(feeUsdAfterDiscount);
-                    feeAmountAfterDiscount = feeUsdAfterDiscount.mul(new anchor_1.BN(Math.pow(10, collateralCustodyAccount.decimals))).div(collateralTokenMinOraclePrice.price);
-                }
-                else {
-                    feeUsdAfterDiscount = feeUsd;
-                    feeAmountAfterDiscount = feeAmount;
-                }
-            }
-            return {
-                entryOraclePrice: entryOraclePrice,
-                feeUsd: feeUsd,
-                feeAmount: feeAmount,
-                feeUsdAfterDiscount: feeUsdAfterDiscount,
-                feeAmountAfterDiscount: feeAmountAfterDiscount,
-                liquidationPrice: liquidationPrice
-            };
-        };
         this.getEntryPriceAndFeeSyncV2 = function (positionAccount, marketCorrelation, collateralDeltaAmount, sizeDeltaAmount, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, discountBps, enableLogs) {
             if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
             if (enableLogs === void 0) { enableLogs = false; }
@@ -766,8 +720,8 @@ var PerpetualsClient = (function () {
             if (positionAccount === null) {
                 var data = __assign({}, types_1.DEFAULT_POSITION);
                 positionAccount = PositionAccount_1.PositionAccount.from(web3_js_1.PublicKey.default, data);
-                var sizeUsd_2 = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-                positionAccount.sizeUsd = sizeUsd_2;
+                var sizeUsd_1 = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
+                positionAccount.sizeUsd = sizeUsd_1;
                 positionAccount.sizeDecimals = targetCustodyAccount.decimals;
                 positionAccount.collateralDecimals = collateralCustodyAccount.decimals;
                 positionAccount.lockedDecimals = collateralCustodyAccount.decimals;
@@ -784,12 +738,13 @@ var PerpetualsClient = (function () {
                 var sizeDeltaUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
                 positionAccount.sizeUsd = positionAccount.sizeUsd.add(sizeDeltaUsd);
             }
-            positionAccount.collateralAmount = positionAccount.collateralAmount.add(collateralDeltaAmount);
+            var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
+            var collateralDeltaUsd = collateralMinMaxPrice.min.getAssetAmountUsd(collateralDeltaAmount, collateralCustodyAccount.decimals);
+            positionAccount.collateralUsd = positionAccount.collateralUsd.add(collateralDeltaUsd);
             positionAccount.sizeAmount = positionAccount.sizeAmount.add(sizeDeltaAmount);
-            var lockFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
-            var liquidationPrice = _this.getLiquidationPriceSync(positionAccount.collateralAmount, positionAccount.sizeAmount, entryOraclePrice, lockFeeUsd, marketCorrelation, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount);
+            var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
+            var liquidationPrice = _this.getLiquidationPriceContractHelper(entryOraclePrice, lockAndUnsettledFeeUsd, side, targetCustodyAccount, positionAccount);
             var sizeAmountUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
-            var collateralTokenMinOraclePrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
             var feeUsd = constants_1.BN_ZERO;
             var feeAmount = constants_1.BN_ZERO;
             var feeUsdAfterDiscount = constants_1.BN_ZERO;
@@ -798,11 +753,11 @@ var PerpetualsClient = (function () {
             }
             else {
                 feeUsd = sizeAmountUsd.mul(targetCustodyAccount.fees.openPosition).div(new anchor_1.BN(constants_1.RATE_POWER));
-                feeAmount = feeUsd.mul(new anchor_1.BN(Math.pow(10, collateralCustodyAccount.decimals))).div(collateralTokenMinOraclePrice.price);
+                feeAmount = feeUsd.mul(new anchor_1.BN(Math.pow(10, collateralCustodyAccount.decimals))).div(collateralMinMaxPrice.min.price);
                 if (discountBps.gt(constants_1.BN_ZERO)) {
                     feeUsdAfterDiscount = feeUsd.mul(discountBps).div(new anchor_1.BN(constants_1.BPS_POWER));
                     feeUsdAfterDiscount = feeUsd.sub(feeUsdAfterDiscount);
-                    feeAmountAfterDiscount = feeUsdAfterDiscount.mul(new anchor_1.BN(Math.pow(10, collateralCustodyAccount.decimals))).div(collateralTokenMinOraclePrice.price);
+                    feeAmountAfterDiscount = feeUsdAfterDiscount.mul(new anchor_1.BN(Math.pow(10, collateralCustodyAccount.decimals))).div(collateralMinMaxPrice.min.price);
                 }
                 else {
                     feeUsdAfterDiscount = feeUsd;
@@ -861,25 +816,26 @@ var PerpetualsClient = (function () {
             if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
                 throw new Error("Delta Amounts cannot be negative ");
             }
-            resultingPositionAccount.collateralAmount = resultingPositionAccount.collateralAmount.sub(collateralDeltaAmount);
-            resultingPositionAccount.sizeAmount = resultingPositionAccount.sizeAmount.sub(sizeDeltaAmount);
             if (resultingPositionAccount.collateralAmount.isNeg() || resultingPositionAccount.sizeAmount.isNeg()) {
                 throw new Error("cannot remove/close more than collateral/Size");
             }
             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 collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
+            var collateralDeltaUsd = collateralMinMaxPrice.min.getAssetAmountUsd(collateralDeltaAmount, collateralCustodyAccount.decimals);
+            resultingPositionAccount.collateralUsd = resultingPositionAccount.collateralUsd.sub(collateralDeltaUsd);
+            resultingPositionAccount.sizeAmount = resultingPositionAccount.sizeAmount.sub(sizeDeltaAmount);
             var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(resultingPositionAccount, collateralCustodyAccount, currentTimestamp);
-            var lockAndUnsettledFee = collateralTokenMinOraclePrice.getTokenAmount(lockAndUnsettledFeeUsd, collateralCustodyAccount.decimals);
+            var lockAndUnsettledFee = collateralMinMaxPrice.min.getTokenAmount(lockAndUnsettledFeeUsd, collateralCustodyAccount.decimals);
             var sizeAmountUsd = exitOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
             var exitFeeUsd = sizeAmountUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
-            var exitFeeAmount = collateralTokenMaxOraclePrice.getTokenAmount(exitFeeUsd, collateralCustodyAccount.decimals);
+            var exitFeeAmount = collateralMinMaxPrice.max.getTokenAmount(exitFeeUsd, collateralCustodyAccount.decimals);
             var exitFeeUsdAfterDiscount = constants_1.BN_ZERO;
             var exitFeeAmountAfterDiscount = constants_1.BN_ZERO;
             if (discountBps.gt(constants_1.BN_ZERO)) {
                 exitFeeUsdAfterDiscount = exitFeeUsd.mul(discountBps).div(new anchor_1.BN(constants_1.BPS_POWER));
                 exitFeeUsdAfterDiscount = exitFeeUsd.sub(exitFeeUsdAfterDiscount);
-                exitFeeAmountAfterDiscount = collateralTokenMaxOraclePrice.getTokenAmount(exitFeeUsdAfterDiscount, collateralCustodyAccount.decimals);
+                exitFeeAmountAfterDiscount = collateralMinMaxPrice.max.getTokenAmount(exitFeeUsdAfterDiscount, collateralCustodyAccount.decimals);
             }
             else {
                 exitFeeUsdAfterDiscount = exitFeeUsd;
@@ -889,7 +845,7 @@ var PerpetualsClient = (function () {
                 price: positionAccount.entryPrice.price, exponent: new anchor_1.BN(positionAccount.entryPrice.exponent), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO
             });
             resultingPositionAccount.sizeUsd = positionEntryOraclePrice.getAssetAmountUsd(resultingPositionAccount.sizeAmount, targetCustodyAccount.decimals);
-            var liquidationPrice = _this.getLiquidationPriceSync(resultingPositionAccount.collateralAmount, resultingPositionAccount.sizeAmount, positionEntryOraclePrice, lockAndUnsettledFeeUsd, marketCorrelation, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount);
+            var liquidationPrice = _this.getLiquidationPriceContractHelper(positionEntryOraclePrice, lockAndUnsettledFeeUsd, side, targetCustodyAccount, positionAccount);
             return {
                 exitOraclePrice: exitOraclePrice,
                 borrowFeeUsd: lockAndUnsettledFeeUsd,
@@ -902,13 +858,11 @@ var PerpetualsClient = (function () {
             };
         };
         this.getTradeSpread = function (targetCustodyAccount, sizeUsd) {
-            if (targetCustodyAccount.pricing.tradeSpreadMax.sub(targetCustodyAccount.pricing.tradeSpreadMin).isZero()
-                ||
-                    sizeUsd.isZero()) {
+            if (targetCustodyAccount.pricing.tradeSpreadMax.sub(targetCustodyAccount.pricing.tradeSpreadMin).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);
+                .div(targetCustodyAccount.pricing.maxPositionSizeUsd);
             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;
@@ -923,21 +877,11 @@ var PerpetualsClient = (function () {
             var exitOraclePrice = OraclePrice_1.OraclePrice.from({ price: exitPriceBN, exponent: maxPrice.exponent, confidence: maxPrice.confidence, timestamp: maxPrice.timestamp });
             return exitOraclePrice;
         };
-        this.getExitOraclePriceWithoutSpreadSync = function (side, targetPrice, targetEmaPrice, targetCustodyAccount) {
-            var _a = _this.getMinAndMaxOraclePriceSync(targetPrice, targetEmaPrice, targetCustodyAccount), minPrice = _a.min, maxPrice = _a.max;
-            if ((0, types_1.isVariant)(side, 'long')) {
-                return minPrice;
-            }
-            else {
-                return maxPrice;
-            }
-        };
         this.getSizeAmountFromLeverageAndCollateral = function (collateralAmtWithFee, leverage, marketToken, collateralToken, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, discountBps) {
             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 collateralAmtMinUsdUi = new bignumber_js_1.default(collateralAmtWithFee.toString()).dividedBy(Math.pow(10, collateralToken.decimals))
-                .multipliedBy(collateralTokenMinPriceUi);
+            var collateralAmtMinUsdUi = new bignumber_js_1.default(collateralAmtWithFee.toString()).dividedBy(Math.pow(10, collateralToken.decimals)).multipliedBy(collateralTokenMinPriceUi);
             var openPosFeeRateUi = new bignumber_js_1.default(targetCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
             if (!discountBps.isZero()) {
                 var discountBpsUi = new bignumber_js_1.default(discountBps.toString()).dividedBy(Math.pow(10, constants_1.BPS_DECIMALS));
@@ -945,20 +889,20 @@ var PerpetualsClient = (function () {
             }
             var sizeUsdUi = collateralAmtMinUsdUi.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 sizeUsd = (0, utils_1.uiDecimalsToNative)(sizeUsdUi.toString(), constants_1.USD_DECIMALS);
+            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount, sizeUsd);
             var entryPriceUsdUi = new bignumber_js_1.default(entryOraclePrice.toUiPrice(constants_1.ORACLE_EXPONENT));
             var sizeAmountUi = sizeUsdUi.dividedBy(entryPriceUsdUi);
             return (0, utils_1.uiDecimalsToNative)(sizeAmountUi.toFixed(marketToken.decimals, bignumber_js_1.default.ROUND_DOWN), marketToken.decimals);
         };
-        this.getSizeAmountWithSwapSync = function (amountIn, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, swapPoolAumUsdMax, poolConfigSwap, discountBps) {
+        this.getSizeAmountWithSwapSync = function (amountIn, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, swapPoolAumUsdMax, poolConfig, discountBps) {
             if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
             var finalCollateralAmount = constants_1.BN_ZERO;
             if (inputTokenCustodyAccount.publicKey.equals(collateralTokenCustodyAccount.publicKey)) {
                 finalCollateralAmount = amountIn;
             }
             else {
-                var swapAmountOut = _this.getSwapAmountAndFeesSync(amountIn, constants_1.BN_ZERO, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, swapPoolAumUsdMax, poolConfigSwap).minAmountOut;
+                var swapAmountOut = _this.getSwapAmountAndFeesSync(amountIn, constants_1.BN_ZERO, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, swapPoolAumUsdMax, poolConfig).minAmountOut;
                 finalCollateralAmount = swapAmountOut;
             }
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount).min;
@@ -972,8 +916,8 @@ var PerpetualsClient = (function () {
             }
             var sizeUsdUi = collateralAmtMinUsdUi.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 sizeUsd = (0, utils_1.uiDecimalsToNative)(sizeUsdUi.toFixed(constants_1.USD_DECIMALS), constants_1.USD_DECIMALS);
+            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, sizeUsd);
             var entryPriceUsdUi = new bignumber_js_1.default(entryOraclePrice.toUiPrice(constants_1.ORACLE_EXPONENT));
             var sizeAmountUi = sizeUsdUi.dividedBy(entryPriceUsdUi);
             return (0, utils_1.uiDecimalsToNative)(sizeAmountUi.toFixed(targetTokenCustodyAccount.decimals, bignumber_js_1.default.ROUND_DOWN), targetTokenCustodyAccount.decimals);
@@ -996,7 +940,7 @@ var PerpetualsClient = (function () {
             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) {
+        this.getCollateralAmountWithSwapSync = function (sizeAmount, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, swapPoolAumUsdMax, poolConfig) {
             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 sizeUsd = targetTokenPrice.getAssetAmountUsd(sizeAmount, targetTokenCustodyAccount.decimals);
@@ -1013,11 +957,11 @@ var PerpetualsClient = (function () {
                 collateralInInputToken = collateralAmountWithFee;
             }
             else {
-                collateralInInputToken = _this.getSwapAmountAndFeesSync(constants_1.BN_ZERO, collateralAmountWithFee, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, swapPoolAumUsdMax, poolConfigSwap).minAmountIn;
+                collateralInInputToken = _this.getSwapAmountAndFeesSync(constants_1.BN_ZERO, collateralAmountWithFee, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, swapPoolAumUsdMax, poolConfig).minAmountIn;
             }
             return collateralInInputToken;
         };
-        this.getDecreaseSizeCollateralAndFeeSync = function (positionAccount, marketCorrelation, sizeDeltaUsd, keepLevSame, targetPrice, targetEmaPrice, marketConfig, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, side, poolConfig, discountBps, debugLogs) {
+        this.getDecreaseSizeCollateralAndFeeSync = function (positionAccount, marketCorrelation, maxPayOffBps, sizeDeltaUsd, keepLevSame, targetPrice, targetEmaPrice, marketConfig, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, side, poolConfig, discountBps, debugLogs) {
             if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
             if (debugLogs === void 0) { debugLogs = false; }
             if (!marketConfig.marketAccount.equals(positionAccount.market)) {
@@ -1039,10 +983,10 @@ var PerpetualsClient = (function () {
             var decimalPower = new anchor_1.BN(Math.pow(10, targetCustodyAccount.decimals));
             var closeRatio = (positionDelta.sizeAmount.mul(decimalPower)).div(positionAccount.sizeAmount);
             positionDelta.sizeUsd = (positionAccount.sizeUsd.mul(closeRatio)).div(decimalPower);
-            positionDelta.unsettledFeesUsd = (positionAccount.unsettledFeesUsd.mul(closeRatio)).div(decimalPower);
             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.collateralUsd = (positionAccount.collateralUsd.mul(closeRatio)).div(decimalPower);
+            positionDelta.unsettledFeesUsd = (positionAccount.unsettledFeesUsd.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));
@@ -1052,29 +996,36 @@ var PerpetualsClient = (function () {
             }
             var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionDelta, collateralCustodyAccount, currentTimestamp);
             var totalFeesUsd = (exitFeeUsd.add(lockAndUnsettledFeeUsd));
-            var currentCollateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(positionDelta.collateralAmount, collateralCustodyAccount.decimals);
+            var currentCollateralUsd = positionDelta.collateralUsd;
             var liabilityUsd = newPnl.lossUsd.add(totalFeesUsd);
-            var assetsUsd = newPnl.profitUsd.add(currentCollateralUsd);
-            var closeAmount, feesAmount;
+            var assetsUsd = anchor_1.BN.min(newPnl.profitUsd.add(currentCollateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionDelta.lockedAmount, collateralCustodyAccount.decimals));
             if (debugLogs) {
                 console.log("assetsUsd.sub(liabilityUsd):", collateralCustodyAccount.decimals, assetsUsd.toString(), liabilityUsd.toString(), assetsUsd.sub(liabilityUsd).toString());
             }
+            var closeAmountUsd, feesAmountUsd;
             if (assetsUsd.gte(liabilityUsd)) {
-                closeAmount = collateralMinMaxPrice.max.getTokenAmount(assetsUsd.sub(liabilityUsd), collateralCustodyAccount.decimals);
-                feesAmount = collateralMinMaxPrice.min.getTokenAmount(totalFeesUsd, collateralCustodyAccount.decimals);
+                closeAmountUsd = assetsUsd.sub(liabilityUsd);
+                feesAmountUsd = totalFeesUsd;
+            }
+            else {
+                closeAmountUsd = constants_1.BN_ZERO;
+                feesAmountUsd = assetsUsd.sub(newPnl.lossUsd);
+            }
+            var closeAmount = collateralMinMaxPrice.max.getTokenAmount(closeAmountUsd, collateralCustodyAccount.decimals);
+            var newLockAmount = collateralMinMaxPrice.max.getTokenAmount(_this.getLockedUsd(constants_1.BN_ZERO, closeAmountUsd, side, marketCorrelation, maxPayOffBps), collateralCustodyAccount.decimals);
+            if (newLockAmount.gt(positionDelta.lockedAmount)) {
+                positionDelta.lockedAmount = constants_1.BN_ZERO;
             }
             else {
-                closeAmount = constants_1.BN_ZERO;
-                feesAmount = collateralMinMaxPrice.min.getTokenAmount(assetsUsd.sub(newPnl.lossUsd), collateralCustodyAccount.decimals);
+                positionDelta.lockedAmount = positionDelta.lockedAmount.sub(newLockAmount);
             }
             var newPosition = PositionAccount_1.PositionAccount.from(positionAccount.publicKey, __assign({}, positionAccount));
             newPosition.sizeAmount = positionAccount.sizeAmount.sub(positionDelta.sizeAmount);
             newPosition.sizeUsd = positionAccount.sizeUsd.sub(positionDelta.sizeUsd);
             newPosition.lockedUsd = positionAccount.lockedUsd.sub(positionDelta.lockedUsd);
             newPosition.lockedAmount = positionAccount.lockedAmount.sub(positionDelta.lockedAmount);
-            newPosition.collateralAmount = positionAccount.collateralAmount.sub(positionDelta.collateralAmount);
+            newPosition.collateralUsd = positionAccount.collateralUsd.sub(positionDelta.collateralUsd);
             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));
@@ -1089,8 +1040,8 @@ var PerpetualsClient = (function () {
             feeUsdWithDiscount = feeUsdWithDiscount.add(lockAndUnsettledFeeUsd);
             if (keepLevSame) {
                 var collateralAmountReceived = closeAmount;
-                var collateralAmountRecievedUsd = collateralMinMaxPrice.min.getAssetAmountUsd(collateralAmountReceived, collateralCustodyAccount.decimals);
-                var _a = _this.getMaxWithdrawableAmountSyncInternal(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmount), maxWithdrawableAmount = _a.maxWithdrawableAmount, diff = _a.diff;
+                var collateralAmountRecievedUsd = closeAmountUsd;
+                var _a = _this.getMaxWithdrawableAmountSyncInternal(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmountUsd), maxWithdrawableAmount = _a.maxWithdrawableAmount, diffUsd = _a.diffUsd;
                 if (debugLogs) {
                     console.log("maxWithdrawableAmount ", maxWithdrawableAmount.toString(), keepLevSame);
                     console.log("collateralAmountReceived ", collateralAmountReceived.toString(), keepLevSame);
@@ -1107,11 +1058,11 @@ var PerpetualsClient = (function () {
                     collateralAmountRecievedUsd = collateralMinMaxPrice.min.getAssetAmountUsd(maxWithdrawableAmount, collateralCustodyAccount.decimals);
                 }
                 var entryPrice = OraclePrice_1.OraclePrice.from({ price: newPosition.entryPrice.price, exponent: new anchor_1.BN(newPosition.entryPrice.exponent), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-                var finalInterestUsd = _this.getLockFeeAndUnsettledUsdForPosition(newPosition, collateralCustodyAccount, currentTimestamp);
-                var finalLiquidationPrice = _this.getLiquidationPriceSync(newPosition.collateralAmount, newPosition.sizeAmount, entryPrice, finalInterestUsd, marketCorrelation, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, newPosition);
+                var lockAndUnsettledFeeUsdNew = _this.getLockFeeAndUnsettledUsdForPosition(newPosition, collateralCustodyAccount, currentTimestamp);
+                var finalLiquidationPrice = _this.getLiquidationPriceContractHelper(entryPrice, lockAndUnsettledFeeUsdNew, side, targetCustodyAccount, newPosition);
                 var finalPnl = _this.getPnlSync(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
                 var finalPnlUsd = finalPnl.profitUsd.sub(finalPnl.lossUsd);
-                var newLev = _this.getLeverageSync(newPosition.sizeUsd, newPosition.collateralAmount, collateralMinMaxPrice.min, collateralCustodyAccount.decimals, constants_1.BN_ZERO);
+                var newLev = _this.getLeverageSync(newPosition, newPosition.collateralUsd, newPosition.sizeUsd, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, false, poolConfig);
                 return {
                     newSizeUsd: newPosition.sizeUsd,
                     feeUsd: feeUsd,
@@ -1120,7 +1071,8 @@ var PerpetualsClient = (function () {
                     newLev: newLev,
                     liquidationPrice: finalLiquidationPrice,
                     collateralAmountRecieved: collateralAmountReceived,
-                    newCollateralAmount: newPosition.collateralAmount.add(diff),
+                    collateralAmountRecievedUsd: collateralAmountRecievedUsd,
+                    newCollateralUsd: newPosition.collateralUsd.add(diffUsd),
                     newPnl: finalPnlUsd
                 };
             }
@@ -1128,8 +1080,8 @@ var PerpetualsClient = (function () {
                 throw "only same leverage is supported for now";
             }
         };
-        this.getMaxWithdrawableAmountSyncInternal = function (positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmount, errorBandwidthPercentageUi) {
-            if (closeAmount === void 0) { closeAmount = constants_1.BN_ZERO; }
+        this.getMaxWithdrawableAmountSyncInternal = function (positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmountUsd, errorBandwidthPercentageUi) {
+            if (closeAmountUsd === void 0) { closeAmountUsd = constants_1.BN_ZERO; }
             if (errorBandwidthPercentageUi === void 0) { errorBandwidthPercentageUi = 5; }
             if (errorBandwidthPercentageUi > 100 || errorBandwidthPercentageUi < 0) {
                 throw new Error("errorBandwidthPercentageUi cannot be >100 or <0");
@@ -1138,61 +1090,63 @@ var PerpetualsClient = (function () {
                 (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 collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
             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 currentCollateralUsd = positionAccount.collateralUsd.sub(closeAmountUsd);
             var availableInitMarginUsd = constants_1.BN_ZERO;
             if (profitLoss.lossUsd.lt(currentCollateralUsd)) {
                 availableInitMarginUsd = currentCollateralUsd.sub(lossUsd);
             }
             else {
                 console.log("profitLoss.lossUsd > coll :: should have been liquidated");
-                return { maxWithdrawableAmount: constants_1.BN_ZERO, diff: constants_1.BN_ZERO };
+                return { maxWithdrawableAmount: constants_1.BN_ZERO, maxWithdrawableAmountUsd: constants_1.BN_ZERO, diffUsd: constants_1.BN_ZERO };
             }
             var maxRemovableCollateralUsd = availableInitMarginUsd.sub(positionAccount.sizeUsd.muln(constants_1.BPS_POWER).div(MAX_INIT_LEVERAGE));
             if (maxRemovableCollateralUsd.isNeg()) {
-                return { maxWithdrawableAmount: constants_1.BN_ZERO, diff: constants_1.BN_ZERO };
+                return { maxWithdrawableAmount: constants_1.BN_ZERO, maxWithdrawableAmountUsd: constants_1.BN_ZERO, diffUsd: constants_1.BN_ZERO };
             }
             var maxWithdrawableAmount = constants_1.BN_ZERO;
-            var diff = constants_1.BN_ZERO;
+            var maxWithdrawableAmountUsd = constants_1.BN_ZERO;
+            var diffUsd = constants_1.BN_ZERO;
             var remainingCollateralUsd = availableInitMarginUsd.sub(maxRemovableCollateralUsd);
             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);
+                diffUsd = (new anchor_1.BN(isDegenMode ? targetCustodyAccount.pricing.minDegenCollateralUsd : targetCustodyAccount.pricing.minCollateralUsd)).sub(remainingCollateralUsd);
+                var updatedMaxRemovableCollateralUsd = maxRemovableCollateralUsd.sub(diffUsd);
                 if (updatedMaxRemovableCollateralUsd.isNeg()) {
-                    return { maxWithdrawableAmount: constants_1.BN_ZERO, diff: constants_1.BN_ZERO };
+                    return { maxWithdrawableAmount: constants_1.BN_ZERO, maxWithdrawableAmountUsd: constants_1.BN_ZERO, diffUsd: constants_1.BN_ZERO };
                 }
                 else {
-                    maxWithdrawableAmount = collateralMaxPrice.getTokenAmount(updatedMaxRemovableCollateralUsd, collateralCustodyAccount.decimals);
+                    maxWithdrawableAmount = collateralMinMaxPrice.max.getTokenAmount(updatedMaxRemovableCollateralUsd, collateralCustodyAccount.decimals);
+                    maxWithdrawableAmountUsd = updatedMaxRemovableCollateralUsd;
                 }
             }
             else {
-                maxWithdrawableAmount = collateralMaxPrice.getTokenAmount(maxRemovableCollateralUsd, collateralCustodyAccount.decimals);
+                maxWithdrawableAmount = collateralMinMaxPrice.max.getTokenAmount(maxRemovableCollateralUsd, collateralCustodyAccount.decimals);
+                maxWithdrawableAmountUsd = maxRemovableCollateralUsd;
             }
-            return { maxWithdrawableAmount: maxWithdrawableAmount, diff: diff };
+            return { maxWithdrawableAmount: maxWithdrawableAmount, maxWithdrawableAmountUsd: maxWithdrawableAmountUsd, diffUsd: diffUsd };
         };
-        this.getFinalCloseAmountSync = function (positionAccount, marketCorrelation, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig) {
+        this.getFinalCloseAmountUsdSync = function (positionAccount, marketCorrelation, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig) {
             var position = PositionAccount_1.PositionAccount.from(positionAccount.publicKey, __assign({}, positionAccount));
             var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
-            var collateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(position.collateralAmount, collateralCustodyAccount.decimals);
             var newPnl = _this.getPnlSync(position, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
             var exitPriceAndFee = _this.getExitPriceAndFeeSync(positionAccount, marketCorrelation, positionAccount.collateralAmount, positionAccount.sizeAmount, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
             var totalFeesUsd = (exitPriceAndFee.exitFeeUsd.add(exitPriceAndFee.borrowFeeUsd));
             var liabilityUsd = newPnl.lossUsd.add(totalFeesUsd);
-            var assetsUsd = newPnl.profitUsd.add(collateralMinMaxPrice.min.getAssetAmountUsd(positionAccount.collateralAmount, positionAccount.collateralDecimals));
-            var closeAmount, feesAmount;
+            var assetsUsd = anchor_1.BN.min(newPnl.profitUsd.add(positionAccount.collateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionAccount.lockedAmount, collateralCustodyAccount.decimals));
+            var closeAmountUsd, feesAmountUsd;
             if (assetsUsd.gt(liabilityUsd)) {
-                closeAmount = collateralMinMaxPrice.max.getTokenAmount(assetsUsd.sub(liabilityUsd), position.collateralDecimals);
-                feesAmount = collateralMinMaxPrice.min.getTokenAmount(totalFeesUsd, positionAccount.collateralDecimals);
+                closeAmountUsd = assetsUsd.sub(liabilityUsd);
+                feesAmountUsd = totalFeesUsd;
             }
             else {
-                closeAmount = constants_1.BN_ZERO;
-                feesAmount = collateralMinMaxPrice.min.getTokenAmount(assetsUsd.sub(newPnl.lossUsd), positionAccount.collateralDecimals);
+                closeAmountUsd = constants_1.BN_ZERO;
+                feesAmountUsd = assetsUsd.sub(newPnl.lossUsd);
             }
-            return { closeAmount: closeAmount, feesAmount: feesAmount };
+            return { closeAmountUsd: closeAmountUsd, feesAmountUsd: feesAmountUsd };
         };
         this.getMaxWithdrawableAmountSync = function (positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, errorBandwidthPercentageUi) {
             if (errorBandwidthPercentageUi === void 0) { errorBandwidthPercentageUi = 5; }
@@ -1205,34 +1159,37 @@ var PerpetualsClient = (function () {
             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;
+                return { maxWithdrawableAmount: constants_1.BN_ZERO, maxWithdrawableAmountUsd: 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 collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
             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 currentCollateralUsd = positionAccount.collateralUsd;
             var availableInitMarginUsd = constants_1.BN_ZERO;
             if (profitLoss.lossUsd.lt(currentCollateralUsd)) {
                 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, maxWithdrawableAmountUsd: 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, maxWithdrawableAmountUsd: constants_1.BN_ZERO };
             }
             var maxWithdrawableAmount;
+            var maxWithdrawableAmountUsd = constants_1.BN_ZERO;
             if (maxRemoveableCollateralUsdAfterMinRequired.lt(maxRemovableCollateralUsd)) {
-                maxWithdrawableAmount = collateralMaxPrice.getTokenAmount(maxRemoveableCollateralUsdAfterMinRequired, collateralCustodyAccount.decimals);
+                maxWithdrawableAmount = collateralMinMaxPrice.max.getTokenAmount(maxRemoveableCollateralUsdAfterMinRequired, collateralCustodyAccount.decimals);
+                maxWithdrawableAmountUsd = maxRemoveableCollateralUsdAfterMinRequired;
             }
             else {
-                maxWithdrawableAmount = collateralMaxPrice.getTokenAmount(maxRemovableCollateralUsd, collateralCustodyAccount.decimals);
+                maxWithdrawableAmount = collateralMinMaxPrice.max.getTokenAmount(maxRemovableCollateralUsd, collateralCustodyAccount.decimals);
+                maxWithdrawableAmountUsd = maxRemovableCollateralUsd;
             }
-            return maxWithdrawableAmount;
+            return { maxWithdrawableAmount: maxWithdrawableAmount, maxWithdrawableAmountUsd: maxWithdrawableAmountUsd };
         };
         this.getCumulativeLockFeeSync = function (custodyAccount, currentTimestamp) {
             var cumulativeLockFee = constants_1.BN_ZERO;
@@ -1275,7 +1232,7 @@ var PerpetualsClient = (function () {
             lockFeeUsd = lockFeeUsd.add(position.unsettledFeesUsd);
             return lockFeeUsd;
         };
-        this.getLockedUsd = function (sideUsd, side, marketCorrelation, maxPayOffBps) {
+        this.getLockedUsd = function (sizeUsd, collateralUsd, side, marketCorrelation, maxPayOffBps) {
             var maxPayOffBpsNew = constants_1.BN_ZERO;
             if (marketCorrelation || (0, types_1.isVariant)(side, 'short')) {
                 maxPayOffBpsNew = anchor_1.BN.min(new anchor_1.BN(constants_1.BPS_POWER), maxPayOffBps);
@@ -1283,188 +1240,141 @@ var PerpetualsClient = (function () {
             else {
                 maxPayOffBpsNew = maxPayOffBps;
             }
-            var lockedUsd = (sideUsd.mul(maxPayOffBpsNew)).div(new anchor_1.BN(constants_1.BPS_POWER));
+            var lockedUsd = ((sizeUsd.add(collateralUsd)).mul(maxPayOffBpsNew)).div(new anchor_1.BN(constants_1.BPS_POWER));
             return lockedUsd;
         };
-        this.getLiquidationPriceSync = function (collateralAmount, sizeAmount, entryOraclePrice, lockAndUnsettledFeeUsd, marketCorrelation, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount) {
+        this.getLiquidationPriceContractHelper = function (entryOraclePrice, lockAndUnsettledFeeUsd, side, targetCustodyAccount, positionAccount) {
             var zeroOraclePrice = OraclePrice_1.OraclePrice.from({
                 price: constants_1.BN_ZERO,
                 exponent: constants_1.BN_ZERO,
                 confidence: constants_1.BN_ZERO,
                 timestamp: constants_1.BN_ZERO
             });
-            if (collateralAmount.isZero() || sizeAmount.isZero()) {
-                return zeroOraclePrice;
-            }
             if (positionAccount.entryPrice.exponent && !entryOraclePrice.exponent.eq(new anchor_1.BN(positionAccount.entryPrice.exponent))) {
                 throw new Error("Exponent mismatch : ".concat(positionAccount.entryPrice.exponent, " & ").concat(entryOraclePrice.exponent.toString(), " ").concat(entryOraclePrice === null || entryOraclePrice === void 0 ? void 0 : entryOraclePrice.toUiPrice(8)));
             }
             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(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;
-            if (marketCorrelation && (0, types_1.isVariant)(side, 'long')) {
-                var newCollateralAmount = void 0;
-                if (targetCustodyAccount.mint == collateralCustodyAccount.mint) {
-                    newCollateralAmount = collateralAmount;
+            if (positionAccount.collateralUsd.gte(liablitiesUsd)) {
+                var priceDiffLossOracle = OraclePrice_1.OraclePrice.from({
+                    price: (positionAccount.collateralUsd.sub(liablitiesUsd)).mul(new anchor_1.BN(Math.pow(10, (positionAccount.sizeDecimals + 3))))
+                        .div(positionAccount.sizeAmount),
+                    exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
+                    confidence: constants_1.BN_ZERO,
+                    timestamp: constants_1.BN_ZERO
+                }).scale_to_exponent(new anchor_1.BN(entryOraclePrice.exponent));
+                if ((0, types_1.isVariant)(side, 'long')) {
+                    liquidationPrice = OraclePrice_1.OraclePrice.from({
+                        price: entryOraclePrice.price.sub(priceDiffLossOracle.price),
+                        exponent: new anchor_1.BN(entryOraclePrice.exponent),
+                        confidence: constants_1.BN_ZERO,
+                        timestamp: constants_1.BN_ZERO
+                    });
                 }
                 else {
-                    var pairPrice = collateralMinMaxPriceOracle.min.price.mul(new anchor_1.BN(10).pow(collateralMinMaxPriceOracle.min.exponent)).div(targetMinMaxPriceOracle.max.price);
-                    var swapPrice = pairPrice.sub(pairPrice.mul(collateralCustodyAccount.pricing.swapSpread).div(new anchor_1.BN(constants_1.BPS_POWER)));
-                    newCollateralAmount = (0, utils_1.checkedDecimalMul)(collateralAmount, new anchor_1.BN(-1 * collateralCustodyAccount.decimals), swapPrice, collateralMinMaxPriceOracle.min.exponent, new anchor_1.BN(-1 * targetCustodyAccount.decimals));
+                    liquidationPrice = OraclePrice_1.OraclePrice.from({
+                        price: entryOraclePrice.price.add(priceDiffLossOracle.price),
+                        exponent: new anchor_1.BN(entryOraclePrice.exponent),
+                        confidence: constants_1.BN_ZERO,
+                        timestamp: constants_1.BN_ZERO
+                    });
                 }
-                var lp = OraclePrice_1.OraclePrice.from({
-                    price: (positionAccount.sizeUsd.add(liablitiesUsd)).mul(new anchor_1.BN(Math.pow(10, (positionAccount.sizeDecimals + 3))))
-                        .div(sizeAmount.add(newCollateralAmount)),
+            }
+            else {
+                var priceDiffProfitOracle = OraclePrice_1.OraclePrice.from({
+                    price: (liablitiesUsd.sub(positionAccount.collateralUsd)).mul(new anchor_1.BN(Math.pow(10, (positionAccount.sizeDecimals + 3))))
+                        .div(positionAccount.sizeAmount),
                     exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
                     confidence: constants_1.BN_ZERO,
                     timestamp: constants_1.BN_ZERO
-                });
-                liquidationPrice = lp.scale_to_exponent(new anchor_1.BN(entryOraclePrice.exponent));
-            }
-            else {
-                var assetsUsd = collateralMinMaxPriceOracle.min.getAssetAmountUsd(collateralAmount, collateralCustodyAccount.decimals);
-                if (assetsUsd.gte(liablitiesUsd)) {
-                    var priceDiffLossOracle = OraclePrice_1.OraclePrice.from({
-                        price: (assetsUsd.sub(liablitiesUsd)).mul(new anchor_1.BN(Math.pow(10, (positionAccount.sizeDecimals + 3))))
-                            .div(positionAccount.sizeAmount),
-                        exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
+                }).scale_to_exponent(new anchor_1.BN(entryOraclePrice.exponent));
+                if ((0, types_1.isVariant)(side, 'long')) {
+                    liquidationPrice = OraclePrice_1.OraclePrice.from({
+                        price: entryOraclePrice.price.add(priceDiffProfitOracle.price),
+                        exponent: new anchor_1.BN(entryOraclePrice.exponent),
                         confidence: constants_1.BN_ZERO,
                         timestamp: constants_1.BN_ZERO
-                    }).scale_to_exponent(new anchor_1.BN(entryOraclePrice.exponent));
-                    if ((0, types_1.isVariant)(side, 'long')) {
-                        liquidationPrice = OraclePrice_1.OraclePrice.from({
-                            price: entryOraclePrice.price.sub(priceDiffLossOracle.price),
-                            exponent: new anchor_1.BN(entryOraclePrice.exponent),
-                            confidence: constants_1.BN_ZERO,
-                            timestamp: constants_1.BN_ZERO
-                        });
-                    }
-                    else {
-                        liquidationPrice = OraclePrice_1.OraclePrice.from({
-                            price: entryOraclePrice.price.add(priceDiffLossOracle.price),
-                            exponent: new anchor_1.BN(entryOraclePrice.exponent),
-                            confidence: constants_1.BN_ZERO,
-                            timestamp: constants_1.BN_ZERO
-                        });
-                    }
+                    });
                 }
                 else {
-                    var priceDiffProfitOracle = OraclePrice_1.OraclePrice.from({
-                        price: (liablitiesUsd.sub(assetsUsd)).mul(new anchor_1.BN(Math.pow(10, (positionAccount.sizeDecimals + 3))))
-                            .div(positionAccount.sizeAmount),
-                        exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
+                    liquidationPrice = OraclePrice_1.OraclePrice.from({
+                        price: entryOraclePrice.price.sub(priceDiffProfitOracle.price),
+                        exponent: new anchor_1.BN(entryOraclePrice.exponent),
                         confidence: constants_1.BN_ZERO,
                         timestamp: constants_1.BN_ZERO
-                    }).scale_to_exponent(new anchor_1.BN(entryOraclePrice.exponent));
-                    if ((0, types_1.isVariant)(side, 'long')) {
-                        liquidationPrice = OraclePrice_1.OraclePrice.from({
-                            price: entryOraclePrice.price.add(priceDiffProfitOracle.price),
-                            exponent: new anchor_1.BN(entryOraclePrice.exponent),
-                            confidence: constants_1.BN_ZERO,
-                            timestamp: constants_1.BN_ZERO
-                        });
-                    }
-                    else {
-                        liquidationPrice = OraclePrice_1.OraclePrice.from({
-                            price: entryOraclePrice.price.sub(priceDiffProfitOracle.price),
-                            exponent: new anchor_1.BN(entryOraclePrice.exponent),
-                            confidence: constants_1.BN_ZERO,
-                            timestamp: constants_1.BN_ZERO
-                        });
-                    }
+                    });
                 }
             }
             return liquidationPrice.price.isNeg() ? zeroOraclePrice : liquidationPrice;
         };
-        this.getLiquidationPriceWithOrder = function (collateralAmount, collateralUsd, sizeAmount, sizeUsd, sizeDecimals, limitOraclePrice, marketCorrelation, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount) {
+        this.getLiquidationPriceSync = function (collateralUsd, sizeAmount, entryOraclePrice, lockAndUnsettledFeeUsd, side, targetPrice, targetCustodyAccount, positionAccount) {
+            var newPositionAccount = positionAccount.clone();
+            newPositionAccount.sizeAmount = sizeAmount;
+            newPositionAccount.sizeUsd = targetPrice.getAssetAmountUsd(sizeAmount, targetCustodyAccount.decimals);
+            newPositionAccount.collateralUsd = collateralUsd;
+            return _this.getLiquidationPriceContractHelper(entryOraclePrice, lockAndUnsettledFeeUsd, side, targetCustodyAccount, newPositionAccount);
+        };
+        this.getLiquidationPriceWithOrder = function (collateralUsd, sizeAmount, sizeUsd, sizeDecimals, limitOraclePrice, side, targetCustodyAccount) {
             var zeroOraclePrice = OraclePrice_1.OraclePrice.from({
                 price: constants_1.BN_ZERO,
                 exponent: constants_1.BN_ZERO,
                 confidence: constants_1.BN_ZERO,
                 timestamp: constants_1.BN_ZERO
             });
-            if (collateralAmount.isZero() || sizeAmount.isZero()) {
-                return zeroOraclePrice;
-            }
             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(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;
-            if (marketCorrelation && (0, types_1.isVariant)(side, 'long')) {
-                var newCollateralAmount = void 0;
-                if (targetCustodyAccount.mint == collateralCustodyAccount.mint) {
-                    newCollateralAmount = collateralAmount;
+            if (collateralUsd.gte(liablitiesUsd)) {
+                var priceDiffLossOracle = OraclePrice_1.OraclePrice.from({
+                    price: (collateralUsd.sub(liablitiesUsd)).mul(new anchor_1.BN(Math.pow(10, (sizeDecimals + 3))))
+                        .div(sizeAmount),
+                    exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
+                    confidence: constants_1.BN_ZERO,
+                    timestamp: constants_1.BN_ZERO
+                }).scale_to_exponent(new anchor_1.BN(limitOraclePrice.exponent));
+                if ((0, types_1.isVariant)(side, 'long')) {
+                    liquidationPrice = OraclePrice_1.OraclePrice.from({
+                        price: limitOraclePrice.price.sub(priceDiffLossOracle.price),
+                        exponent: new anchor_1.BN(limitOraclePrice.exponent),
+                        confidence: constants_1.BN_ZERO,
+                        timestamp: constants_1.BN_ZERO
+                    });
                 }
                 else {
-                    var pairPrice = collateralMinMaxPriceOracle.min.price.mul(new anchor_1.BN(10).pow(collateralMinMaxPriceOracle.min.exponent)).div(targetMinMaxPriceOracle.max.price);
-                    var swapPrice = pairPrice.sub(pairPrice.mul(collateralCustodyAccount.pricing.swapSpread).div(new anchor_1.BN(constants_1.BPS_POWER)));
-                    newCollateralAmount = (0, utils_1.checkedDecimalMul)(collateralAmount, new anchor_1.BN(-1 * collateralCustodyAccount.decimals), swapPrice, collateralMinMaxPriceOracle.min.exponent, new anchor_1.BN(-1 * targetCustodyAccount.decimals));
+                    liquidationPrice = OraclePrice_1.OraclePrice.from({
+                        price: limitOraclePrice.price.add(priceDiffLossOracle.price),
+                        exponent: new anchor_1.BN(limitOraclePrice.exponent),
+                        confidence: constants_1.BN_ZERO,
+                        timestamp: constants_1.BN_ZERO
+                    });
                 }
-                var lp = OraclePrice_1.OraclePrice.from({
-                    price: (sizeUsd.add(liablitiesUsd)).mul(new anchor_1.BN(Math.pow(10, (sizeDecimals + 3))))
-                        .div(sizeAmount.add(newCollateralAmount)),
+            }
+            else {
+                var priceDiffProfitOracle = OraclePrice_1.OraclePrice.from({
+                    price: (liablitiesUsd.sub(collateralUsd)).mul(new anchor_1.BN(Math.pow(10, (sizeDecimals + 3))))
+                        .div(sizeAmount),
                     exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
                     confidence: constants_1.BN_ZERO,
                     timestamp: constants_1.BN_ZERO
-                });
-                liquidationPrice = lp.scale_to_exponent(new anchor_1.BN(limitOraclePrice.exponent));
-            }
-            else {
-                var assetsUsd = collateralUsd;
-                if (assetsUsd.gte(liablitiesUsd)) {
-                    var priceDiffLossOracle = OraclePrice_1.OraclePrice.from({
-                        price: (assetsUsd.sub(liablitiesUsd)).mul(new anchor_1.BN(Math.pow(10, (sizeDecimals + 3))))
-                            .div(sizeAmount),
-                        exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
+                }).scale_to_exponent(new anchor_1.BN(limitOraclePrice.exponent));
+                if ((0, types_1.isVariant)(side, 'long')) {
+                    liquidationPrice = OraclePrice_1.OraclePrice.from({
+                        price: limitOraclePrice.price.add(priceDiffProfitOracle.price),
+                        exponent: new anchor_1.BN(limitOraclePrice.exponent),
                         confidence: constants_1.BN_ZERO,
                         timestamp: constants_1.BN_ZERO
-                    }).scale_to_exponent(new anchor_1.BN(limitOraclePrice.exponent));
-                    if ((0, types_1.isVariant)(side, 'long')) {
-                        liquidationPrice = OraclePrice_1.OraclePrice.from({
-                            price: limitOraclePrice.price.sub(priceDiffLossOracle.price),
-                            exponent: new anchor_1.BN(limitOraclePrice.exponent),
-                            confidence: constants_1.BN_ZERO,
-                            timestamp: constants_1.BN_ZERO
-                        });
-                    }
-                    else {
-                        liquidationPrice = OraclePrice_1.OraclePrice.from({
-                            price: limitOraclePrice.price.add(priceDiffLossOracle.price),
-                            exponent: new anchor_1.BN(limitOraclePrice.exponent),
-                            confidence: constants_1.BN_ZERO,
-                            timestamp: constants_1.BN_ZERO
-                        });
-                    }
+                    });
                 }
                 else {
-                    var priceDiffProfitOracle = OraclePrice_1.OraclePrice.from({
-                        price: (liablitiesUsd.sub(assetsUsd)).mul(new anchor_1.BN(Math.pow(10, (sizeDecimals + 3))))
-                            .div(sizeAmount),
-                        exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
+                    liquidationPrice = OraclePrice_1.OraclePrice.from({
+                        price: limitOraclePrice.price.sub(priceDiffProfitOracle.price),
+                        exponent: new anchor_1.BN(limitOraclePrice.exponent),
                         confidence: constants_1.BN_ZERO,
                         timestamp: constants_1.BN_ZERO
-                    }).scale_to_exponent(new anchor_1.BN(limitOraclePrice.exponent));
-                    if ((0, types_1.isVariant)(side, 'long')) {
-                        liquidationPrice = OraclePrice_1.OraclePrice.from({
-                            price: limitOraclePrice.price.add(priceDiffProfitOracle.price),
-                            exponent: new anchor_1.BN(limitOraclePrice.exponent),
-                            confidence: constants_1.BN_ZERO,
-                            timestamp: constants_1.BN_ZERO
-                        });
-                    }
-                    else {
-                        liquidationPrice = OraclePrice_1.OraclePrice.from({
-                            price: limitOraclePrice.price.sub(priceDiffProfitOracle.price),
-                            exponent: new anchor_1.BN(limitOraclePrice.exponent),
-                            confidence: constants_1.BN_ZERO,
-                            timestamp: constants_1.BN_ZERO
-                        });
-                    }
+                    });
                 }
             }
             return liquidationPrice.price.isNeg() ? zeroOraclePrice : liquidationPrice;
@@ -1540,8 +1450,8 @@ var PerpetualsClient = (function () {
             positionAccount.market = marketAccountPk;
             positionAccount.lockedUsd = targetTokenPrice.getAssetAmountUsd(positionAccount.sizeAmount, targetCustodyAccount.decimals);
             positionAccount.lockedAmount = collateralPrice.getTokenAmount(positionAccount.lockedUsd, collateralCustodyAccount.decimals);
-            positionAccount.collateralAmount = positionAccount.collateralAmount.add(collateralDeltaAmount);
-            positionAccount.collateralUsd = collateralPrice.getAssetAmountUsd(positionAccount.collateralAmount, collateralCustodyAccount.decimals);
+            var collateralDeltaUsd = collateralPrice.getAssetAmountUsd(collateralDeltaAmount, collateralCustodyAccount.decimals);
+            positionAccount.collateralUsd = positionAccount.collateralUsd.add(collateralDeltaUsd);
             var currentTime = new anchor_1.BN((0, utils_1.getUnixTs)());
             var pnl = _this.getPnlSync(positionAccount, userEntrytpSlOraclePrice, userEntrytpSlOraclePrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTime, targetCustodyAccount.pricing.delaySeconds, poolConfig);
             var pnlUsd = pnl.profitUsd.sub(pnl.lossUsd);
@@ -1613,6 +1523,9 @@ var PerpetualsClient = (function () {
             });
         };
         this.getPnlSync = function (positionAccount, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, delay, poolConfig) {
+            return _this.getPnlContractHelper(positionAccount, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, delay, poolConfig);
+        };
+        this.getPnlContractHelper = function (positionAccount, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, delay, poolConfig) {
             if (positionAccount.sizeUsd.isZero() || positionAccount.entryPrice.price.isZero()) {
                 return {
                     profitUsd: constants_1.BN_ZERO,
@@ -1671,7 +1584,7 @@ var PerpetualsClient = (function () {
             }
             if (priceDiffProfit.price.gt(constants_1.BN_ZERO)) {
                 return {
-                    profitUsd: anchor_1.BN.min(priceDiffProfit.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals), collateralMinPrice.getAssetAmountUsd(positionAccount.lockedAmount, positionAccount.lockedDecimals)),
+                    profitUsd: priceDiffProfit.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
                     lossUsd: constants_1.BN_ZERO,
                 };
             }
@@ -1762,6 +1675,9 @@ var PerpetualsClient = (function () {
             }
         };
         this.getAssetsUnderManagementUsdSync = function (poolAccount, tokenPrices, tokenEmaPrices, custodies, markets, aumCalcMode, currentTime, poolConfig) {
+            return _this.getAssetsUnderManagementUsdContractHelper(poolAccount, tokenPrices, tokenEmaPrices, custodies, markets, aumCalcMode, currentTime, poolConfig);
+        };
+        this.getAssetsUnderManagementUsdContractHelper = function (poolAccount, tokenPrices, tokenEmaPrices, custodies, markets, aumCalcMode, currentTime, poolConfig) {
             var poolAmountUsd = constants_1.BN_ZERO;
             for (var index = 0; index < custodies.length; index++) {
                 if (custodies.length != poolAccount.custodies.length || !custodies[index].publicKey.equals(poolAccount.custodies[index])) {
@@ -1774,6 +1690,7 @@ var PerpetualsClient = (function () {
                 var token_amount_usd = tokenMinMaxPrice.max.getAssetAmountUsd(custodies[index].assets.owned, custodies[index].decimals);
                 poolAmountUsd = poolAmountUsd.add(token_amount_usd);
             }
+            poolAmountUsd = poolAmountUsd.sub(poolAccount.feesObligationUsd.add(poolAccount.rebateObligationUsd));
             if (aumCalcMode === "includePnl") {
                 var poolEquityUsd = poolAmountUsd;
                 for (var index = 0; index < markets.length; index++) {
@@ -1783,11 +1700,12 @@ var PerpetualsClient = (function () {
                     var targetCustodyId = poolAccount.getCustodyId(markets[index].targetCustody);
                     var collateralCustodyId = poolAccount.getCustodyId(markets[index].collateralCustody);
                     var position = markets[index].getCollectivePosition();
+                    poolEquityUsd = poolEquityUsd.sub(position.collateralUsd);
                     var collectivePnl = _this.getPnlSync(position, tokenPrices[targetCustodyId], tokenEmaPrices[targetCustodyId], custodies[targetCustodyId], tokenPrices[collateralCustodyId], tokenEmaPrices[collateralCustodyId], custodies[collateralCustodyId], currentTime, custodies[targetCustodyId].pricing.delaySeconds, poolConfig);
                     var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(tokenPrices[collateralCustodyId], tokenEmaPrices[collateralCustodyId], custodies[collateralCustodyId]);
-                    var collectiveCollateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(position.collateralAmount, position.collateralDecimals);
-                    var collectiveLossUsd = anchor_1.BN.min(collectivePnl.lossUsd, collectiveCollateralUsd);
-                    poolEquityUsd = (poolEquityUsd.add(collectiveLossUsd)).sub(collectivePnl.profitUsd);
+                    var collectiveLossUsd = anchor_1.BN.min(collectivePnl.lossUsd, position.collateralUsd);
+                    var collectiveProfitUsd = anchor_1.BN.min(collectivePnl.profitUsd, collateralMinMaxPrice.max.getAssetAmountUsd(position.lockedAmount, custodies[collateralCustodyId].decimals).sub(position.collateralUsd));
+                    poolEquityUsd = (poolEquityUsd.add(collectiveLossUsd)).sub(collectiveProfitUsd);
                 }
                 return { poolAmountUsd: poolAmountUsd, poolEquityUsd: poolEquityUsd };
             }
@@ -1795,14 +1713,6 @@ var PerpetualsClient = (function () {
                 return { poolAmountUsd: poolAmountUsd, poolEquityUsd: constants_1.BN_ZERO };
             }
         };
-        this.getNftFinalDiscount = function (perpetualsAccount, nftTradingAccount, currentTime) {
-            if (currentTime.sub(nftTradingAccount.timestamp).lt(constants_1.DAY_SECONDS) && nftTradingAccount.counter.gt(new anchor_1.BN(perpetualsAccount.tradeLimit))) {
-                return { discountBn: constants_1.BN_ZERO };
-            }
-            else {
-                return { discountBn: perpetualsAccount.tradingDiscount[nftTradingAccount.level - 1] };
-            }
-        };
         this.getFeeDiscount = function (perpetualsAccount, tokenStakeAccount, currentTime) {
             if (tokenStakeAccount.level === 0) {
                 return { discountBn: constants_1.BN_ZERO };
@@ -1887,7 +1797,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.getStakedLpTokenPrice = function (poolKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_1, token, _a, custodies_2, custody, _b, _c, market, transaction, backUpOracleInstruction, result, index, res;
+            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_1, token, _a, custodies_2, custody, _b, _c, market, transaction, backUpOracleInstruction, setCULimitIx, result, index, res;
             var _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
@@ -1935,6 +1845,8 @@ var PerpetualsClient = (function () {
                         return [4, backUpOracleInstructionPromise];
                     case 2:
                         backUpOracleInstruction = _e.sent();
+                        setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
+                        transaction.instructions.unshift(setCULimitIx);
                         (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
                         return [4, this.viewHelper.simulateTransaction(transaction)];
                     case 3:
@@ -2001,7 +1913,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 4] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, depositCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle) {
-                var custodies, custodyMetas, marketMetas, _a, custodies_5, token, _b, custodies_6, custody, _c, _d, market, depositCustodyConfig, transaction, backUpOracleInstruction, result, index, res;
+                var custodies, custodyMetas, marketMetas, _a, custodies_5, token, _b, custodies_6, custody, _c, _d, market, depositCustodyConfig, transaction, setCULimitIx, backUpOracleInstruction, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
@@ -2052,6 +1964,8 @@ var PerpetualsClient = (function () {
                                     .transaction()];
                         case 1:
                             transaction = _f.sent();
+                            setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
+                            transaction.instructions.unshift(setCULimitIx);
                             if (!enableBackupOracle) return [3, 3];
                             return [4, (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true)];
                         case 2:
@@ -2061,6 +1975,14 @@ var PerpetualsClient = (function () {
                         case 3: return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
                         case 4:
                             result = _f.sent();
+                            if (result.value.err) {
+                                console.error('error Simulation failed:::', result);
+                                return [2, {
+                                        amount: undefined,
+                                        fee: undefined,
+                                        error: 'Simulation failed: ' + JSON.stringify(result.value.err),
+                                    }];
+                            }
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddLiquidityAmountAndFee'; });
                             res = this.viewHelper.decodeLogs(result, index, 'getAddLiquidityAmountAndFee');
                             return [2, {
@@ -2077,7 +1999,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 4] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([amount_1, poolKey_1, removeTokenCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle) {
-                var custodies, custodyMetas, marketMetas, _a, custodies_7, token, _b, custodies_8, custody, _c, _d, market, removeCustodyConfig, transaction, backUpOracleInstruction, result, index, res;
+                var custodies, custodyMetas, marketMetas, _a, custodies_7, token, _b, custodies_8, custody, _c, _d, market, removeCustodyConfig, transaction, setCULimitIx, backUpOracleInstruction, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
@@ -2128,6 +2050,8 @@ var PerpetualsClient = (function () {
                                     .transaction()];
                         case 1:
                             transaction = _f.sent();
+                            setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
+                            transaction.instructions.unshift(setCULimitIx);
                             if (!enableBackupOracle) return [3, 3];
                             return [4, (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true)];
                         case 2:
@@ -2139,9 +2063,11 @@ var PerpetualsClient = (function () {
                             result = _f.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveLiquidityAmountAndFee'; });
                             if (result.value.err) {
+                                console.error('error Simulation failed:', result);
                                 return [2, {
-                                        amount: new anchor_1.BN(0),
-                                        fee: new anchor_1.BN(0),
+                                        amount: undefined,
+                                        fee: undefined,
+                                        error: 'Simulation failed: ' + JSON.stringify(result.value.err),
                                     }];
                             }
                             res = this.viewHelper.decodeLogs(result, index, 'getRemoveLiquidityAmountAndFee');
@@ -2154,7 +2080,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.getCompoundingLPTokenPrice = function (poolKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_9, token, _a, custodies_10, custody, _b, _c, market, backUpOracleInstruction, transaction, result, index, res;
+            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_9, token, _a, custodies_10, custody, _b, _c, market, backUpOracleInstruction, transaction, setCULimitIx, result, index, res;
             var _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
@@ -2202,6 +2128,8 @@ var PerpetualsClient = (function () {
                                 .transaction()];
                     case 2:
                         transaction = _e.sent();
+                        setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
+                        transaction.instructions.unshift(setCULimitIx);
                         (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
                         return [4, this.viewHelper.simulateTransaction(transaction)];
                     case 3:
@@ -2218,7 +2146,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 4] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, depositCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle) {
-                var custodies, custodyMetas, marketMetas, _a, custodies_11, token, _b, custodies_12, custody, _c, _d, market, depositCustodyConfig, rewardCustody, transaction, backUpOracleInstruction, result, index, res;
+                var custodies, custodyMetas, marketMetas, _a, custodies_11, token, _b, custodies_12, custody, _c, _d, market, depositCustodyConfig, rewardCustody, transaction, setCULimitIx, backUpOracleInstruction, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
@@ -2273,6 +2201,8 @@ var PerpetualsClient = (function () {
                                     .transaction()];
                         case 1:
                             transaction = _f.sent();
+                            setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
+                            transaction.instructions.unshift(setCULimitIx);
                             if (!enableBackupOracle) return [3, 3];
                             return [4, (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true)];
                         case 2:
@@ -2298,7 +2228,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 4] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([amount_1, poolKey_1, removeTokenCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle) {
-                var custodies, custodyMetas, marketMetas, _a, custodies_13, token, _b, custodies_14, custody, _c, _d, market, removeCustodyConfig, rewardCustody, transaction, backUpOracleInstruction, result, index, res;
+                var custodies, custodyMetas, marketMetas, _a, custodies_13, token, _b, custodies_14, custody, _c, _d, market, removeCustodyConfig, rewardCustody, transaction, setCULimitIx, backUpOracleInstruction, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
@@ -2353,6 +2283,8 @@ var PerpetualsClient = (function () {
                                     .transaction()];
                         case 1:
                             transaction = _f.sent();
+                            setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
+                            transaction.instructions.unshift(setCULimitIx);
                             if (!enableBackupOracle) return [3, 3];
                             return [4, (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true)];
                         case 2:
@@ -2547,11 +2479,10 @@ var PerpetualsClient = (function () {
             for (var _i = 8; _i < arguments.length; _i++) {
                 args_1[_i - 8] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, priceWithSlippage_1, collateralWithfee_1, size_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, priceWithSlippage, collateralWithfee, size, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, priceWithSlippage_1, collateralWithfee_1, size_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, priceWithSlippage, collateralWithfee, size, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, skipBalanceChecks, ephemeralSignerPubkey) {
                 var publicKey, targetCustodyConfig, collateralCustodyConfig, collateralToken, marketAccount, userCollateralTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, params, instruction;
                 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; }
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
@@ -2644,7 +2575,7 @@ var PerpetualsClient = (function () {
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: collateralCustodyConfig.mintKey
                                 })
-                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
+                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
                         case 7:
                             instruction = _c.sent();
@@ -2662,11 +2593,10 @@ var PerpetualsClient = (function () {
             for (var _i = 6; _i < arguments.length; _i++) {
                 args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([marketSymbol_1, collateralSymbol_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (marketSymbol, collateralSymbol, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+            return __awaiter(_this, __spreadArray([marketSymbol_1, collateralSymbol_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (marketSymbol, collateralSymbol, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
                 var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, instruction, closeWsolATAIns, error_1;
                 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; }
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
@@ -2745,7 +2675,7 @@ var PerpetualsClient = (function () {
                                     collateralMint: collateralCustodyConfig.mintKey,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                                 })
-                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
+                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
                         case 6:
                             instruction = _b.sent();
@@ -2767,16 +2697,15 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.swapAndOpen = function (targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, minCollateralAmountOut_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1) {
+        this.swapAndOpen = function (targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1) {
             var args_1 = [];
-            for (var _i = 10; _i < arguments.length; _i++) {
-                args_1[_i - 10] = arguments[_i];
+            for (var _i = 9; _i < arguments.length; _i++) {
+                args_1[_i - 9] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, minCollateralAmountOut_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, minCollateralAmountOut, priceWithSlippage, sizeAmount, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, userInputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, targetToken, userInputTokenAccount, userInputToken, lamports, unWrappedSolBalance, _a, userOutputTokenAccount, tokenAccountBalance, _b, userOutputTokenAccount, rebateMintAccount, inx, err_3;
+            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, priceWithSlippage, sizeAmount, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, skipBalanceChecks, ephemeralSignerPubkey) {
+                var publicKey, userInputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, targetToken, userInputTokenAccount, userInputToken, lamports, unWrappedSolBalance, _a, userOutputTokenAccount, tokenAccountBalance, _b, userOutputTokenAccount, inx, err_3;
                 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; }
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
@@ -2870,18 +2799,10 @@ var PerpetualsClient = (function () {
                             }
                             _c.label = 10;
                         case 10:
-                            rebateMintAccount = {
-                                pubkey: collateralCustodyConfig.mintKey,
-                                isSigner: false,
-                                isWritable: false
-                            };
-                            _c.label = 11;
-                        case 11:
-                            _c.trys.push([11, 13, , 14]);
+                            _c.trys.push([10, 12, , 13]);
                             return [4, this.program.methods
                                     .swapAndOpen({
                                     amountIn: amountIn,
-                                    minCollateralAmountOut: minCollateralAmountOut,
                                     priceWithSlippage: priceWithSlippage,
                                     sizeAmount: sizeAmount,
                                     privilege: privilege
@@ -2912,17 +2833,17 @@ var PerpetualsClient = (function () {
                                     collateralMint: collateralCustodyConfig.mintKey,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                                 })
-                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
+                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
-                        case 12:
+                        case 11:
                             inx = _c.sent();
                             instructions.push(inx);
-                            return [3, 14];
-                        case 13:
+                            return [3, 13];
+                        case 12:
                             err_3 = _c.sent();
                             console.error("perpClient SwapAndOpen error:: ", err_3);
                             throw err_3;
-                        case 14: return [2, {
+                        case 13: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -2930,16 +2851,15 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.closeAndSwap = function (targetTokenSymbol_1, userOutputTokenSymbol_1, collateralTokenSymbol_1, minSwapAmountOut_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1) {
+        this.closeAndSwap = function (targetTokenSymbol_1, userOutputTokenSymbol_1, collateralTokenSymbol_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1) {
             var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
+            for (var _i = 7; _i < arguments.length; _i++) {
+                args_1[_i - 7] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, userOutputTokenSymbol_1, collateralTokenSymbol_1, minSwapAmountOut_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, userOutputTokenSymbol, collateralTokenSymbol, minSwapAmountOut, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, ephemeralSignerPubkey) {
-                var publicKey, userOutputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, collateralToken, userOutputToken, lamports, userCollateralTokenAccount, rebateMintAccount, inx, err_4;
+            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, userOutputTokenSymbol_1, collateralTokenSymbol_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, userOutputTokenSymbol, collateralTokenSymbol, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, ephemeralSignerPubkey) {
+                var publicKey, userOutputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, collateralToken, userOutputToken, lamports, userCollateralTokenAccount, inx, err_4;
                 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; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -3005,18 +2925,12 @@ var PerpetualsClient = (function () {
                             if (!(_a.sent())) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralToken.mintKey, collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
-                            rebateMintAccount = {
-                                pubkey: collateralCustodyConfig.mintKey,
-                                isSigner: false,
-                                isWritable: false
-                            };
                             _a.label = 5;
                         case 5:
                             _a.trys.push([5, 7, , 8]);
                             return [4, this.program.methods
                                     .closeAndSwap({
                                     priceWithSlippage: priceWithSlippage,
-                                    minSwapAmountOut: minSwapAmountOut,
                                     privilege: privilege
                                 })
                                     .accounts({
@@ -3045,7 +2959,7 @@ var PerpetualsClient = (function () {
                                     collateralMint: collateralCustodyConfig.mintKey,
                                     collateralTokenProgram: collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                                 })
-                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
+                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
                         case 6:
                             inx = _a.sent();
@@ -3166,12 +3080,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.swapAndAddCollateral = function (targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, minCollateralAmountOut_1, side_1, positionPubKey_1, poolConfig_1) {
+        this.swapAndAddCollateral = function (targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, side_1, positionPubKey_1, poolConfig_1) {
             var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
+            for (var _i = 7; _i < arguments.length; _i++) {
+                args_1[_i - 7] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, minCollateralAmountOut_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, inputSymbol, collateralSymbol, amountIn, minCollateralAmountOut, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, inputSymbol, collateralSymbol, amountIn, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, marketAccount, instruction;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
@@ -3250,7 +3164,6 @@ var PerpetualsClient = (function () {
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.program.methods.swapAndAddCollateral({
                                     amountIn: amountIn,
-                                    minCollateralAmountOut: minCollateralAmountOut,
                                 }).accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
@@ -3286,12 +3199,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.removeCollateral = function (collateralWithFee_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1) {
+        this.removeCollateral = function (collateralDeltaUsd_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1) {
             var args_1 = [];
             for (var _i = 6; _i < arguments.length; _i++) {
                 args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([collateralWithFee_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralWithFee, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+            return __awaiter(_this, __spreadArray([collateralDeltaUsd_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralDeltaUsd, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, marketAccount, instruction, closeWsolATAIns, error_2;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
@@ -3355,7 +3268,7 @@ var PerpetualsClient = (function () {
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.program.methods
                                     .removeCollateral({
-                                    collateralDelta: collateralWithFee,
+                                    collateralDeltaUsd: collateralDeltaUsd,
                                 })
                                     .accounts({
                                     owner: publicKey,
@@ -3397,12 +3310,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.removeCollateralAndSwap = function (targetSymbol_1, collateralSymbol_1, outputSymbol_1, minSwapAmountOut_1, collateralDelta_1, side_1, poolConfig_1) {
+        this.removeCollateralAndSwap = function (targetSymbol_1, collateralSymbol_1, outputSymbol_1, collateralDeltaUsd_1, side_1, poolConfig_1) {
             var args_1 = [];
-            for (var _i = 7; _i < arguments.length; _i++) {
-                args_1[_i - 7] = arguments[_i];
+            for (var _i = 6; _i < arguments.length; _i++) {
+                args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, outputSymbol_1, minSwapAmountOut_1, collateralDelta_1, side_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, outputSymbol, minSwapAmountOut, collateralDelta, side, poolConfig, ephemeralSignerPubkey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, outputSymbol_1, collateralDeltaUsd_1, side_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, outputSymbol, collateralDeltaUsd, side, poolConfig, ephemeralSignerPubkey) {
                 var publicKey, targetCustodyConfig, collateralCustodyConfig, outputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, marketAccount, positionAccount, instruction;
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_a) {
@@ -3459,8 +3372,7 @@ var PerpetualsClient = (function () {
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             return [4, this.program.methods
                                     .removeCollateralAndSwap({
-                                    collateralDelta: collateralDelta,
-                                    minSwapAmountOut: minSwapAmountOut,
+                                    collateralDeltaUsd: collateralDeltaUsd,
                                 })
                                     .accounts({
                                     owner: publicKey,
@@ -3505,11 +3417,10 @@ var PerpetualsClient = (function () {
             for (var _i = 8; _i < arguments.length; _i++) {
                 args_1[_i - 8] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, positionPubKey_1, side_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, positionPubKey, side, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, positionPubKey_1, side_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, positionPubKey, side, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount) {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, instruction;
                 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; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -3552,7 +3463,7 @@ var PerpetualsClient = (function () {
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey
                                 })
-                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
+                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
                         case 1:
                             instruction = _a.sent();
@@ -3570,11 +3481,10 @@ var PerpetualsClient = (function () {
             for (var _i = 8; _i < arguments.length; _i++) {
                 args_1[_i - 8] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount) {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, instruction;
                 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; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -3617,7 +3527,7 @@ var PerpetualsClient = (function () {
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey
                                 })
-                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
+                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
                         case 1:
                             instruction = _a.sent();
@@ -4084,119 +3994,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.updateNftAccount = function (nftMint, updateReferer, updateBooster, flpStakeAccounts) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, flpStakeAccountMetas, _i, flpStakeAccounts_1, flpStakeAccountPk, updateNftTradingAccountInstruction, err_8;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        publicKey = this.provider.wallet.publicKey;
-                        preInstructions = [];
-                        instructions = [];
-                        postInstructions = [];
-                        additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 4, , 5]);
-                        nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                            Buffer.from("trading"),
-                            nftMint.toBuffer(),
-                        ], this.programId)[0];
-                        nftReferralAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                            Buffer.from("referral"),
-                            publicKey.toBuffer(),
-                        ], this.programId)[0];
-                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(nftMint, publicKey, true)];
-                    case 2:
-                        nftTokenAccount = _a.sent();
-                        flpStakeAccountMetas = [];
-                        for (_i = 0, flpStakeAccounts_1 = flpStakeAccounts; _i < flpStakeAccounts_1.length; _i++) {
-                            flpStakeAccountPk = flpStakeAccounts_1[_i];
-                            flpStakeAccountMetas.push({
-                                pubkey: flpStakeAccountPk,
-                                isSigner: false,
-                                isWritable: true,
-                            });
-                        }
-                        return [4, this.program.methods
-                                .updateTradingAccount({
-                                updateReferer: updateReferer,
-                                updateBooster: updateBooster
-                            })
-                                .accounts({
-                                owner: publicKey,
-                                feePayer: publicKey,
-                                nftTokenAccount: nftTokenAccount,
-                                referralAccount: nftReferralAccount,
-                                tradingAccount: nftTradingAccount
-                            })
-                                .instruction()];
-                    case 3:
-                        updateNftTradingAccountInstruction = _a.sent();
-                        instructions.push(updateNftTradingAccountInstruction);
-                        return [3, 5];
-                    case 4:
-                        err_8 = _a.sent();
-                        console.log("perpClient updateNftAccount error:: ", err_8);
-                        throw err_8;
-                    case 5: return [2, {
-                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
-        this.levelUp = function (poolConfig, nftMint, authorizationRulesAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, levelUpInstruction, err_9;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        publicKey = this.provider.wallet.publicKey;
-                        preInstructions = [];
-                        instructions = [];
-                        postInstructions = [];
-                        additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                            Buffer.from("trading"),
-                            nftMint.toBuffer(),
-                        ], this.programId)[0];
-                        metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        return [4, this.program.methods
-                                .levelUp({})
-                                .accounts({
-                                owner: publicKey,
-                                perpetuals: this.perpetuals.publicKey,
-                                pool: poolConfig.poolAddress,
-                                metadataAccount: metadataAccount,
-                                nftMint: nftMint,
-                                metadataProgram: constants_1.METAPLEX_PROGRAM_ID,
-                                tradingAccount: nftTradingAccount,
-                                transferAuthority: this.authority.publicKey,
-                                authorizationRulesAccount: authorizationRulesAccount,
-                                authorizationRulesProgram: new web3_js_1.PublicKey('auth9SigNpDKz4sJJ1DfCTuZrZNSAgh9sFD3rboVmgg'),
-                                systemProgram: web3_js_1.SystemProgram.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                            })
-                                .instruction()];
-                    case 2:
-                        levelUpInstruction = _a.sent();
-                        instructions.push(levelUpInstruction);
-                        return [3, 4];
-                    case 3:
-                        err_9 = _a.sent();
-                        console.log("perpClient levelUp error:: ", err_9);
-                        throw err_9;
-                    case 4: return [2, {
-                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
         this.depositStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_10;
+            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_8;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4238,9 +4037,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_10 = _a.sent();
-                        console.log("perpClient depositStaking error:: ", err_10);
-                        throw err_10;
+                        err_8 = _a.sent();
+                        console.log("perpClient depositStaking error:: ", err_8);
+                        throw err_8;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4249,7 +4048,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.refreshStakeWithAllFlpStakeAccounts = function (rewardSymbol, poolConfig, flpStakeAccountPks) { return __awaiter(_this, void 0, void 0, function () {
-            var rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_1, flpStakeAccountPk, refreshStakeInstruction, err_11;
+            var rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_1, flpStakeAccountPk, refreshStakeInstruction, err_9;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -4296,9 +4095,9 @@ var PerpetualsClient = (function () {
                         refreshStakeInstruction = _c.sent();
                         return [2, refreshStakeInstruction];
                     case 2:
-                        err_11 = _c.sent();
-                        console.log("perpClient refreshStaking error:: ", err_11);
-                        throw err_11;
+                        err_9 = _c.sent();
+                        console.log("perpClient refreshStaking error:: ", err_9);
+                        throw err_9;
                     case 3: return [2];
                 }
             });
@@ -4309,7 +4108,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, flpStakeAccountPk_1], args_1, true), void 0, function (rewardSymbol, poolConfig, flpStakeAccountPk, userPublicKey) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _a, _b, custody, stakeAccountMetas, tokenStakeAccount, refreshStakeInstruction, err_12;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _a, _b, custody, stakeAccountMetas, tokenStakeAccount, refreshStakeInstruction, err_10;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 return __generator(this, function (_c) {
                     switch (_c.label) {
@@ -4357,9 +4156,9 @@ var PerpetualsClient = (function () {
                             refreshStakeInstruction = _c.sent();
                             return [2, refreshStakeInstruction];
                         case 2:
-                            err_12 = _c.sent();
-                            console.log("perpClient refreshStaking error:: ", err_12);
-                            throw err_12;
+                            err_10 = _c.sent();
+                            console.log("perpClient refreshStaking error:: ", err_10);
+                            throw err_10;
                         case 3: return [2];
                     }
                 });
@@ -4371,7 +4170,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([rewardSymbol_1, unstakeAmount_1, poolConfig_1], args_1, true), void 0, function (rewardSymbol, unstakeAmount, poolConfig, userPublicKey) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _a, unstakeInstantInstruction, err_13;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _a, unstakeInstantInstruction, err_11;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -4423,9 +4222,9 @@ var PerpetualsClient = (function () {
                             instructions.push(unstakeInstantInstruction);
                             return [3, 6];
                         case 5:
-                            err_13 = _b.sent();
-                            console.log("perpClient unstakeInstant error:: ", err_13);
-                            throw err_13;
+                            err_11 = _b.sent();
+                            console.log("perpClient unstakeInstant error:: ", err_11);
+                            throw err_11;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4435,7 +4234,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.setFeeShareBps = function (poolConfig, flpStakeAccountPks) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, pool, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_2, flpStakeAccountPk, refreshStakeInstruction, err_14;
+            var publicKey, pool, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_2, flpStakeAccountPk, refreshStakeInstruction, err_12;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -4479,15 +4278,15 @@ var PerpetualsClient = (function () {
                         refreshStakeInstruction = _c.sent();
                         return [2, refreshStakeInstruction];
                     case 2:
-                        err_14 = _c.sent();
-                        console.log("perpClient refreshStaking error:: ", err_14);
-                        throw err_14;
+                        err_12 = _c.sent();
+                        console.log("perpClient refreshStaking error:: ", err_12);
+                        throw err_12;
                     case 3: return [2];
                 }
             });
         }); };
         this.unstakeRequest = function (unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_15;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_13;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4521,9 +4320,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_15 = _a.sent();
-                        console.log("perpClient unstakeRequest error:: ", err_15);
-                        throw err_15;
+                        err_13 = _a.sent();
+                        console.log("perpClient unstakeRequest error:: ", err_13);
+                        throw err_13;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4537,7 +4336,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 1] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([poolConfig_1], args_1, true), void 0, function (poolConfig, pendingActivation, deactivated, createUserLPTA, userPublicKey) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_16;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_14;
                 if (pendingActivation === void 0) { pendingActivation = true; }
                 if (deactivated === void 0) { deactivated = true; }
                 if (createUserLPTA === void 0) { createUserLPTA = true; }
@@ -4593,9 +4392,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_16 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_16);
-                            throw err_16;
+                            err_14 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_14);
+                            throw err_14;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4610,7 +4409,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, tokenStakeAccount_1], args_1, true), void 0, function (rewardSymbol, poolConfig, tokenStakeAccount, createUserATA) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tokenStakeAccounts, withdrawStakeInstruction, err_17;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tokenStakeAccounts, withdrawStakeInstruction, err_15;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -4671,9 +4470,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_17 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_17);
-                            throw err_17;
+                            err_15 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_15);
+                            throw err_15;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4688,7 +4487,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 5] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([amountIn_1, minCompoundingAmountOut_1, inTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
-                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, addCompoundingLiquidity, err_18;
+                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, addCompoundingLiquidity, err_16;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
@@ -4816,8 +4615,8 @@ var PerpetualsClient = (function () {
                             instructions.push(addCompoundingLiquidity);
                             return [3, 10];
                         case 9:
-                            err_18 = _f.sent();
-                            console.log("perpClient addCompoundingLiquidity error:: ", err_18);
+                            err_16 = _f.sent();
+                            console.log("perpClient addCompoundingLiquidity error:: ", err_16);
                             return [3, 10];
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -4833,7 +4632,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 5] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([compoundingAmountIn_1, minAmountOut_1, outTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (compoundingAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA, ephemeralSignerPubkey, userPublicKey) {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, compoundingTokenAccount, removeCompoundingLiquidity, err_19;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, compoundingTokenAccount, removeCompoundingLiquidity, err_17;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
@@ -4945,8 +4744,8 @@ var PerpetualsClient = (function () {
                             instructions.push(removeCompoundingLiquidity);
                             return [3, 8];
                         case 7:
-                            err_19 = _f.sent();
-                            console.log("perpClient removeCompoundingLiquidity error:: ", err_19);
+                            err_17 = _f.sent();
+                            console.log("perpClient removeCompoundingLiquidity error:: ", err_17);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -4962,7 +4761,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([amount_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amount, rewardTokenMint, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _b, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, migrateStake, err_20;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _b, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, migrateStake, err_18;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_g) {
                     switch (_g.label) {
@@ -5060,8 +4859,8 @@ var PerpetualsClient = (function () {
                             instructions.push(migrateStake);
                             return [3, 8];
                         case 7:
-                            err_20 = _g.sent();
-                            console.log("perpClient migrateStake error:: ", err_20);
+                            err_18 = _g.sent();
+                            console.log("perpClient migrateStake error:: ", err_18);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5072,7 +4871,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.migrateFlp = function (amount, rewardTokenMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_21;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_19;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -5144,8 +4943,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_21 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_21);
+                        err_19 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_19);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5160,7 +4959,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 1] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([poolConfig_1], args_1, true), void 0, function (poolConfig, rewardTokenSymbol) {
-                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, compoundingFee, err_22;
+                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, compoundingFee, err_20;
                 if (rewardTokenSymbol === void 0) { rewardTokenSymbol = 'USDC'; }
                 return __generator(this, function (_e) {
                     switch (_e.label) {
@@ -5218,8 +5017,8 @@ var PerpetualsClient = (function () {
                             instructions.push(compoundingFee);
                             return [3, 4];
                         case 3:
-                            err_22 = _e.sent();
-                            console.log("perpClient compoundingFee error:: ", err_22);
+                            err_20 = _e.sent();
+                            console.log("perpClient compoundingFee error:: ", err_20);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -5229,158 +5028,20 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.burnAndClaim = function (owner, nftMint, poolConfig, createAta) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, userTokenAccount, _a, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndClaimInstruction, err_23;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+        this.depositTokenStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_21;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         preInstructions = [];
                         instructions = [];
                         postInstructions = [];
                         additionalSigners = [];
-                        _b.label = 1;
+                        _a.label = 1;
                     case 1:
-                        _b.trys.push([1, 7, , 8]);
-                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.tokenMint, owner, true)];
-                    case 2:
-                        userTokenAccount = _b.sent();
-                        _a = createAta;
-                        if (!_a) return [3, 4];
-                        return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
-                    case 3:
-                        _a = !(_b.sent());
-                        _b.label = 4;
-                    case 4:
-                        if (_a) {
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(owner, userTokenAccount, owner, poolConfig.tokenMint));
-                        }
-                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(nftMint, owner, true)];
-                    case 5:
-                        nftTokenAccount = _b.sent();
-                        nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                            Buffer.from("trading"),
-                            nftMint.toBuffer(),
-                        ], this.programId)[0];
-                        metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        collectionMetadata = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), poolConfig.nftCollectionAddress.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        edition = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer(), Buffer.from("edition")], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        tokenRecord = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer(), Buffer.from("token_record"), nftTokenAccount.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        return [4, this.program.methods
-                                .burnAndClaim({})
-                                .accounts({
-                                owner: owner,
-                                receivingTokenAccount: userTokenAccount,
-                                perpetuals: this.perpetuals.publicKey,
-                                tokenVault: poolConfig.tokenVault,
-                                tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
-                                metadataAccount: metadataAccount,
-                                collectionMetadata: collectionMetadata,
-                                edition: edition,
-                                tokenRecord: tokenRecord,
-                                tradingAccount: nftTradingAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                metadataProgram: constants_1.METAPLEX_PROGRAM_ID,
-                                nftMint: nftMint,
-                                nftTokenAccount: nftTokenAccount,
-                                systemProgram: web3_js_1.SystemProgram.programId,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
-                                receivingTokenMint: poolConfig.tokenMint,
-                            })
-                                .instruction()];
-                    case 6:
-                        burnAndClaimInstruction = _b.sent();
-                        instructions.push(burnAndClaimInstruction);
-                        return [3, 8];
-                    case 7:
-                        err_23 = _b.sent();
-                        console.log("perpClient burnAndClaimInstruction error:: ", err_23);
-                        throw err_23;
-                    case 8: return [2, {
-                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
-        this.burnAndStake = function (owner, feePayer, nftMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndStakeInstruction, err_24;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        preInstructions = [];
-                        instructions = [];
-                        postInstructions = [];
-                        additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
-                        nftTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(nftMint, owner, true);
-                        nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                            Buffer.from("trading"),
-                            nftMint.toBuffer(),
-                        ], this.programId)[0];
-                        metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        collectionMetadata = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), poolConfig.nftCollectionAddress.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        edition = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer(), Buffer.from("edition")], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        tokenRecord = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer(), Buffer.from("token_record"), nftTokenAccount.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        return [4, this.program.methods
-                                .burnAndStake({})
-                                .accounts({
-                                owner: owner,
-                                feePayer: feePayer,
-                                perpetuals: this.perpetuals.publicKey,
-                                tokenVault: poolConfig.tokenVault,
-                                tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
-                                tokenStakeAccount: tokenStakeAccount,
-                                metadataAccount: metadataAccount,
-                                collectionMetadata: collectionMetadata,
-                                edition: edition,
-                                tokenRecord: tokenRecord,
-                                tradingAccount: nftTradingAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                metadataProgram: constants_1.METAPLEX_PROGRAM_ID,
-                                nftMint: nftMint,
-                                nftTokenAccount: nftTokenAccount,
-                                systemProgram: web3_js_1.SystemProgram.programId,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId
-                            })
-                                .instruction()];
-                    case 2:
-                        burnAndStakeInstruction = _a.sent();
-                        instructions.push(burnAndStakeInstruction);
-                        return [3, 4];
-                    case 3:
-                        err_24 = _a.sent();
-                        console.log("perpClient burnAndStakeInstruction error:: ", err_24);
-                        throw err_24;
-                    case 4: return [2, {
-                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
-        this.depositTokenStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_25;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        preInstructions = [];
-                        instructions = [];
-                        postInstructions = [];
-                        additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 4, , 5]);
-                        tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
-                        userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.tokenMint, owner, true);
+                        _a.trys.push([1, 4, , 5]);
+                        tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
+                        userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.tokenMint, owner, true);
                         return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
                     case 2:
                         if (!(_a.sent())) {
@@ -5410,9 +5071,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositTokenStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_25 = _a.sent();
-                        console.log("perpClient depositStakingInstruction error:: ", err_25);
-                        throw err_25;
+                        err_21 = _a.sent();
+                        console.log("perpClient depositStakingInstruction error:: ", err_21);
+                        throw err_21;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5421,7 +5082,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.unstakeTokenRequest = function (owner, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_26;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_22;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5450,9 +5111,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_26 = _a.sent();
-                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_26);
-                        throw err_26;
+                        err_22 = _a.sent();
+                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_22);
+                        throw err_22;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5461,7 +5122,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.unstakeTokenInstant = function (owner, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, unstakeTokenInstantInstruction, err_27;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, unstakeTokenInstantInstruction, err_23;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5502,9 +5163,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenInstantInstruction);
                         return [3, 5];
                     case 4:
-                        err_27 = _a.sent();
-                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_27);
-                        throw err_27;
+                        err_23 = _a.sent();
+                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_23);
+                        throw err_23;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5513,7 +5174,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawToken = function (owner, withdrawRequestId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_28;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_24;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5554,9 +5215,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawTokenInstruction);
                         return [3, 5];
                     case 4:
-                        err_28 = _a.sent();
-                        console.log("perpClient withdrawTokenInstruction error:: ", err_28);
-                        throw err_28;
+                        err_24 = _a.sent();
+                        console.log("perpClient withdrawTokenInstruction error:: ", err_24);
+                        throw err_24;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5565,7 +5226,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelUnstakeRequest = function (owner, withdrawRequestId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeRequestInstruction, err_29;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeRequestInstruction, err_25;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5594,9 +5255,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelUnstakeRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_29 = _a.sent();
-                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_29);
-                        throw err_29;
+                        err_25 = _a.sent();
+                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_25);
+                        throw err_25;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5610,7 +5271,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 2] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, poolConfig_1], args_1, true), void 0, function (owner, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, _a, collectTokenRewardInstruction, err_30;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, _a, collectTokenRewardInstruction, err_26;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -5656,9 +5317,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectTokenRewardInstruction);
                             return [3, 6];
                         case 5:
-                            err_30 = _b.sent();
-                            console.log("perpClient collectTokenRewardInstruction error:: ", err_30);
-                            throw err_30;
+                            err_26 = _b.sent();
+                            console.log("perpClient collectTokenRewardInstruction error:: ", err_26);
+                            throw err_26;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5673,7 +5334,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, rewardSymbol_1, poolConfig_1], args_1, true), void 0, function (owner, rewardSymbol, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_31;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_27;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -5720,9 +5381,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectRevenueInstruction);
                             return [3, 6];
                         case 5:
-                            err_31 = _b.sent();
-                            console.log("perpClient collectRevenueInstruction error:: ", err_31);
-                            throw err_31;
+                            err_27 = _b.sent();
+                            console.log("perpClient collectRevenueInstruction error:: ", err_27);
+                            throw err_27;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5731,179 +5392,82 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.initRewardVault = function (nftCount, rewardSymbol, collectionMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, nftTransferAuthority, initRewardVault, err_32;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        publicKey = this.provider.wallet.publicKey;
-                        rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
-                        instructions = [];
-                        additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        fbNftProgramData = web3_js_1.PublicKey.findProgramAddressSync([this.programFbnftReward.programId.toBuffer()], new web3_js_1.PublicKey("BPFLoaderUpgradeab1e11111111111111111111111"))[0];
-                        rewardVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_vault")], this.programFbnftReward.programId)[0];
-                        rewardTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_token_account")], this.programFbnftReward.programId)[0];
-                        nftTransferAuthority = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("transfer_authority")], this.programFbnftReward.programId)[0];
-                        return [4, this.programFbnftReward.methods
-                                .initRewardVault({
-                                nftCount: nftCount
-                            })
-                                .accounts({
-                                admin: publicKey,
-                                transferAuthority: nftTransferAuthority,
-                                rewardVault: rewardVault,
-                                rewardMint: rewardCustodyMint,
-                                rewardTokenAccount: rewardTokenAccount,
-                                collectionMint: collectionMint,
-                                programData: fbNftProgramData,
-                                systemProgram: web3_js_1.SystemProgram.programId,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                rent: web3_js_1.SYSVAR_RENT_PUBKEY
-                            })
-                                .instruction()];
-                    case 2:
-                        initRewardVault = _a.sent();
-                        instructions.push(initRewardVault);
-                        return [3, 4];
-                    case 3:
-                        err_32 = _a.sent();
-                        console.log("perpClient InitRewardVault error:: ", err_32);
-                        throw err_32;
-                    case 4: return [2, {
-                            instructions: __spreadArray([], instructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
-        this.distributeReward = function (rewardAmount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_33;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        publicKey = this.provider.wallet.publicKey;
-                        rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
-                        instructions = [];
-                        additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        fundingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
-                        rewardVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_vault")], this.programFbnftReward.programId)[0];
-                        rewardTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_token_account")], this.programFbnftReward.programId)[0];
-                        return [4, this.programFbnftReward.methods
-                                .distributeRewards({
-                                rewardAmount: rewardAmount
-                            })
-                                .accounts({
-                                admin: publicKey,
-                                fundingAccount: fundingAccount,
-                                rewardVault: rewardVault,
-                                rewardTokenAccount: rewardTokenAccount,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                            })
-                                .instruction()];
-                    case 2:
-                        distributeReward = _a.sent();
-                        instructions.push(distributeReward);
-                        return [3, 4];
-                    case 3:
-                        err_33 = _a.sent();
-                        console.log("perpClient distributeReward error:: ", err_33);
-                        throw err_33;
-                    case 4: return [2, {
-                            instructions: __spreadArray([], instructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
-        this.collectNftReward = function (rewardSymbol_1, poolConfig_1, nftMint_1) {
+        this.collectRebate = function (owner_1, rebateSymbol_1, poolConfig_1) {
             var args_1 = [];
             for (var _i = 3; _i < arguments.length; _i++) {
                 args_1[_i - 3] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, nftMint_1], args_1, true), void 0, function (rewardSymbol, poolConfig, nftMint, createUserATA) {
-                var publicKey, rewardToken, rewardCustodyMint, instructions, additionalSigners, nftTokenAccount, metadataAccount, receivingTokenAccount, _a, rewardRecord, rewardVault, rewardTokenAccount, nftTransferAuthority, collectNftReward, err_34;
+            return __awaiter(_this, __spreadArray([owner_1, rebateSymbol_1, poolConfig_1], args_1, true), void 0, function (owner, rebateSymbol, poolConfig, createUserATA) {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateMint, tokenStakeAccount, userTokenAccount, _a, collectRebateInstruction, err_28;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            rewardToken = poolConfig.getTokenFromSymbol(rewardSymbol);
-                            rewardCustodyMint = rewardToken.mintKey;
+                            preInstructions = [];
                             instructions = [];
+                            postInstructions = [];
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 5, , 6]);
-                            nftTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(nftMint, publicKey, true);
-                            metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            rebateMint = poolConfig.getTokenFromSymbol(rebateSymbol).mintKey;
+                            tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
+                            userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rebateMint, owner, true);
                             _a = createUserATA;
                             if (!_a) return [3, 3];
-                            return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
+                            return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
                         case 2:
                             _a = !(_b.sent());
                             _b.label = 3;
                         case 3:
                             if (_a) {
-                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
-                            }
-                            rewardRecord = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_record"), nftMint.toBuffer()], this.programFbnftReward.programId)[0];
-                            rewardVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_vault")], this.programFbnftReward.programId)[0];
-                            rewardTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_token_account")], this.programFbnftReward.programId)[0];
-                            nftTransferAuthority = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("transfer_authority")], this.programFbnftReward.programId)[0];
-                            return [4, this.programFbnftReward.methods
-                                    .collectReward()
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userTokenAccount, publicKey, rebateMint));
+                            }
+                            return [4, this.program.methods
+                                    .collectRebate()
                                     .accounts({
-                                    owner: publicKey,
-                                    feePayer: publicKey,
-                                    nftMint: nftMint,
-                                    nftTokenAccount: nftTokenAccount,
-                                    metadataAccount: metadataAccount,
-                                    receivingAccount: receivingTokenAccount,
-                                    rewardRecord: rewardRecord,
-                                    rewardVault: rewardVault,
-                                    rewardTokenAccount: rewardTokenAccount,
-                                    transferAuthority: nftTransferAuthority,
-                                    systemProgram: web3_js_1.SystemProgram.programId,
-                                    tokenProgram: rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    owner: owner,
+                                    receivingTokenAccount: userTokenAccount,
+                                    perpetuals: this.perpetuals.publicKey,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    rebateVault: poolConfig.rebateVault,
+                                    rebateTokenAccount: poolConfig.rebateTokenAccount,
+                                    tokenStakeAccount: tokenStakeAccount,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
+                                    receivingTokenMint: rebateMint,
                                 })
                                     .instruction()];
                         case 4:
-                            collectNftReward = _b.sent();
-                            instructions.push(collectNftReward);
+                            collectRebateInstruction = _b.sent();
+                            instructions.push(collectRebateInstruction);
                             return [3, 6];
                         case 5:
-                            err_34 = _b.sent();
-                            throw err_34;
+                            err_28 = _b.sent();
+                            console.log("perpClient collectRebateInstruction error:: ", err_28);
+                            throw err_28;
                         case 6: return [2, {
-                                instructions: __spreadArray([], instructions, true),
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
                     }
                 });
             });
         };
-        this.collectAndDistributeFee = function (rewardSymbol_1, poolConfig_1) {
+        this.settleRebates = function (owner_1, rebateSymbol_1, rewardSymbol_1, poolConfig_1) {
             var args_1 = [];
-            for (var _i = 2; _i < arguments.length; _i++) {
-                args_1[_i - 2] = arguments[_i];
+            for (var _i = 4; _i < arguments.length; _i++) {
+                args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1], args_1, true), void 0, function (rewardSymbol, poolConfig, createUserATA, nftTradingAccount) {
-                var publicKey, rewardToken, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, rewardVault, rewardTokenAccount, withdrawStakeInstruction, err_35;
+            return __awaiter(_this, __spreadArray([owner_1, rebateSymbol_1, rewardSymbol_1, poolConfig_1], args_1, true), void 0, function (owner, rebateSymbol, rewardSymbol, poolConfig, createUserATA) {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, rebateMint, userTokenAccount, _a, settleRebatesInstruction, err_29;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            rewardToken = poolConfig.getTokenFromSymbol(rewardSymbol);
-                            rewardCustodyMint = rewardToken.mintKey;
-                            rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(rewardToken.mintKey); });
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
@@ -5911,59 +5475,45 @@ var PerpetualsClient = (function () {
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 5, , 6]);
-                            pool = poolConfig.poolAddress;
-                            flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), pool.toBuffer()], this.program.programId)[0];
-                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            rewardCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
+                            rebateMint = poolConfig.getTokenFromSymbol(rebateSymbol).mintKey;
+                            userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rebateMint, owner, true);
                             _a = createUserATA;
                             if (!_a) return [3, 3];
-                            return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
+                            return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
                         case 2:
                             _a = !(_b.sent());
                             _b.label = 3;
                         case 3:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint));
-                            }
-                            tradingAccount = [];
-                            if (nftTradingAccount) {
-                                tradingAccount.push({
-                                    pubkey: nftTradingAccount,
-                                    isSigner: false,
-                                    isWritable: true,
-                                });
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userTokenAccount, publicKey, rebateMint));
                             }
-                            rewardVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_vault")], this.programFbnftReward.programId)[0];
-                            rewardTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_token_account")], this.programFbnftReward.programId)[0];
-                            return [4, this.programPerpComposability.methods
-                                    .collectAndDistributeFee()
+                            return [4, this.program.methods
+                                    .settleRebates()
                                     .accounts({
-                                    perpProgram: this.programId,
-                                    owner: publicKey,
-                                    receivingTokenAccount: receivingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: this.perpetuals.publicKey,
-                                    pool: pool,
-                                    feeCustody: rewardCustodyConfig.custodyAccount,
-                                    flpStakeAccount: flpStakeAccount,
-                                    feeCustodyTokenAccount: rewardCustodyConfig.tokenAccount,
-                                    systemProgram: web3_js_1.SystemProgram.programId,
+                                    pool: poolConfig.poolAddress,
+                                    rewardCustody: rewardCustody.custodyAccount,
+                                    rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
+                                    rewardCustodyTokenAccount: rewardCustody.tokenAccount,
+                                    rebateVault: poolConfig.rebateVault,
+                                    rebateTokenAccount: poolConfig.rebateTokenAccount,
+                                    tokenMint: rebateMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    fbnftRewardsProgram: this.programFbnftReward.programId,
-                                    rewardVault: rewardVault,
-                                    rewardTokenAccount: rewardTokenAccount
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
-                                    .remainingAccounts(tradingAccount)
                                     .instruction()];
                         case 4:
-                            withdrawStakeInstruction = _b.sent();
-                            instructions.push(withdrawStakeInstruction);
+                            settleRebatesInstruction = _b.sent();
+                            instructions.push(settleRebatesInstruction);
                             return [3, 6];
                         case 5:
-                            err_35 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_35);
-                            throw err_35;
+                            err_29 = _b.sent();
+                            console.log("perpClient settleRebatesInstruction error:: ", err_29);
+                            throw err_29;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5978,7 +5528,7 @@ var PerpetualsClient = (function () {
                 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_36;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_30;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
@@ -6084,9 +5634,9 @@ var PerpetualsClient = (function () {
                             instructions.push(placeLimitOrder);
                             return [3, 10];
                         case 9:
-                            err_36 = _c.sent();
-                            console.log("perpClient placeLimitOrder error:: ", err_36);
-                            throw err_36;
+                            err_30 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_30);
+                            throw err_30;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6101,7 +5651,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_37;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_31;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_b) {
@@ -6192,9 +5742,9 @@ var PerpetualsClient = (function () {
                             instructions.push(editLimitOrder);
                             return [3, 8];
                         case 7:
-                            err_37 = _b.sent();
-                            console.log("perpClient editLimitOrder error:: ", err_37);
-                            throw err_37;
+                            err_31 = _b.sent();
+                            console.log("perpClient editLimitOrder error:: ", err_31);
+                            throw err_31;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6208,11 +5758,10 @@ var PerpetualsClient = (function () {
             for (var _i = 7; _i < arguments.length; _i++) {
                 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_38;
+            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) {
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_32;
                 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; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -6255,16 +5804,16 @@ var PerpetualsClient = (function () {
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey,
                                 })
-                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
+                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
                         case 2:
                             executeLimitOrder = _a.sent();
                             instructions.push(executeLimitOrder);
                             return [3, 4];
                         case 3:
-                            err_38 = _a.sent();
-                            console.log("perpClient executeLimitOrder error:: ", err_38);
-                            throw err_38;
+                            err_32 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_32);
+                            throw err_32;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6278,11 +5827,10 @@ var PerpetualsClient = (function () {
             for (var _i = 8; _i < arguments.length; _i++) {
                 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_39;
+            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) {
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitWithSwap, err_33;
                 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; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -6328,16 +5876,16 @@ var PerpetualsClient = (function () {
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey,
                                 })
-                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
+                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
                         case 2:
                             executeLimitWithSwap = _a.sent();
                             instructions.push(executeLimitWithSwap);
                             return [3, 4];
                         case 3:
-                            err_39 = _a.sent();
-                            console.log("perpClient executeLimitWithSwap error:: ", err_39);
-                            throw err_39;
+                            err_33 = _a.sent();
+                            console.log("perpClient executeLimitWithSwap error:: ", err_33);
+                            throw err_33;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6347,7 +5895,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_40;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_34;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6395,9 +5943,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_40 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_40);
-                        throw err_40;
+                        err_34 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_34);
+                        throw err_34;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6406,7 +5954,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_41;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_35;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6453,9 +6001,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_41 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_41);
-                        throw err_41;
+                        err_35 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_35);
+                        throw err_35;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6464,7 +6012,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_42;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_36;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6497,9 +6045,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_42 = _a.sent();
-                        console.log("perpClient cancelTriggerOrder error:: ", err_42);
-                        throw err_42;
+                        err_36 = _a.sent();
+                        console.log("perpClient cancelTriggerOrder error:: ", err_36);
+                        throw err_36;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6508,7 +6056,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_43;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_37;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6539,9 +6087,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelAllTriggerOrders);
                         return [3, 4];
                     case 3:
-                        err_43 = _a.sent();
-                        console.log("perpClient cancelAllTriggerOrders error:: ", err_43);
-                        throw err_43;
+                        err_37 = _a.sent();
+                        console.log("perpClient cancelAllTriggerOrders error:: ", err_37);
+                        throw err_37;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6554,13 +6102,12 @@ var PerpetualsClient = (function () {
             for (var _i = 9; _i < arguments.length; _i++) {
                 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_44;
+            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) {
+                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_38;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 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; }
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6655,16 +6202,16 @@ var PerpetualsClient = (function () {
                                     collateralMint: collateralCustodyConfig.mintKey,
                                     collateralTokenProgram: collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                                 })
-                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
+                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
                         case 8:
                             executeTriggerWithSwap = _e.sent();
                             instructions.push(executeTriggerWithSwap);
                             return [3, 10];
                         case 9:
-                            err_44 = _e.sent();
-                            console.log("perpClient executeTriggerWithSwap error:: ", err_44);
-                            throw err_44;
+                            err_38 = _e.sent();
+                            console.log("perpClient executeTriggerWithSwap error:: ", err_38);
+                            throw err_38;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6678,13 +6225,12 @@ var PerpetualsClient = (function () {
             for (var _i = 8; _i < arguments.length; _i++) {
                 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_45;
+            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) {
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_39;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 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; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6744,16 +6290,16 @@ var PerpetualsClient = (function () {
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: collateralCustodyConfig.mintKey
                                 })
-                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
+                                    .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
                         case 6:
                             executeTriggerOrder = _b.sent();
                             instructions.push(executeTriggerOrder);
                             return [3, 8];
                         case 7:
-                            err_45 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_45);
-                            throw err_45;
+                            err_39 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_39);
+                            throw err_39;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6768,7 +6314,7 @@ var PerpetualsClient = (function () {
                 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_46;
+                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_40;
                 if (useFeesPool === void 0) { useFeesPool = false; }
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (unWrapSol === void 0) { unWrapSol = false; }
@@ -6973,9 +6519,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 20];
                         case 19:
-                            err_46 = _g.sent();
-                            console.error("perpClient Swap error:: ", err_46);
-                            throw err_46;
+                            err_40 = _g.sent();
+                            console.error("perpClient Swap error:: ", err_40);
+                            throw err_40;
                         case 20: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6985,7 +6531,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_47;
+            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_41;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -7030,11 +6576,7 @@ var PerpetualsClient = (function () {
                                 rewardCustody: rewardCustody.custodyAccount,
                                 rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
                                 rewardCustodyTokenAccount: rewardCustody.tokenAccount,
-                                custody: custody.custodyAccount,
-                                custodyOracleAccount: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
-                                custodyTokenAccount: custody.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
@@ -7045,9 +6587,9 @@ var PerpetualsClient = (function () {
                         instructions.push(inx);
                         return [3, 4];
                     case 3:
-                        err_47 = _b.sent();
-                        console.error("perpClient Swap error:: ", err_47);
-                        throw err_47;
+                        err_41 = _b.sent();
+                        console.error("perpClient Swap error:: ", err_41);
+                        throw err_41;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7056,7 +6598,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_48;
+            var instructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, setLpTokenPriceInstruction, err_42;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -7104,9 +6646,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setLpTokenPriceInstruction);
                         return [3, 4];
                     case 3:
-                        err_48 = _d.sent();
-                        console.log("perpClient setLpTokenPriceInstruction error:: ", err_48);
-                        throw err_48;
+                        err_42 = _d.sent();
+                        console.log("perpClient setLpTokenPriceInstruction error:: ", err_42);
+                        throw err_42;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7154,7 +6696,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setAdminSigners = function (admins, minSignatures) { return __awaiter(_this, void 0, void 0, function () {
-            var adminMetas, _i, admins_2, admin, err_49;
+            var adminMetas, _i, admins_2, admin, err_43;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7184,11 +6726,11 @@ var PerpetualsClient = (function () {
                         _a.sent();
                         return [3, 4];
                     case 3:
-                        err_49 = _a.sent();
+                        err_43 = _a.sent();
                         if (this.printErrors) {
-                            console.error("setAdminSigners err:", err_49);
+                            console.error("setAdminSigners err:", err_43);
                         }
-                        throw err_49;
+                        throw err_43;
                     case 4: return [2];
                 }
             });
@@ -7377,7 +6919,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_50;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_44;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7410,9 +6952,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_50 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_50);
-                        throw err_50;
+                        err_44 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_44);
+                        throw err_44;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7421,7 +6963,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.moveProtocolFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_51;
+            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_45;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7455,9 +6997,9 @@ var PerpetualsClient = (function () {
                         instructions.push(moveProtocolFeesIx);
                         return [3, 4];
                     case 3:
-                        err_51 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_51);
-                        throw err_51;
+                        err_45 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_45);
+                        throw err_45;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7466,7 +7008,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setProtocolFeeShareBps = function (feeShareBps, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, setProtocolFeeShareBpsIx, err_52;
+            var publicKey, setProtocolFeeShareBpsIx, err_46;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7486,15 +7028,15 @@ var PerpetualsClient = (function () {
                         setProtocolFeeShareBpsIx = _a.sent();
                         return [2, setProtocolFeeShareBpsIx];
                     case 2:
-                        err_52 = _a.sent();
-                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_52);
-                        throw err_52;
+                        err_46 = _a.sent();
+                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_46);
+                        throw err_46;
                     case 3: return [2];
                 }
             });
         }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_53;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_47;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7521,9 +7063,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_53 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_53);
-                        throw err_53;
+                        err_47 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_47);
+                        throw err_47;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7532,7 +7074,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_54;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_48;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -7593,9 +7135,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_54 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_54);
-                        throw err_54;
+                        err_48 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_48);
+                        throw err_48;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7603,8 +7145,8 @@ 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_55;
+        this.setInternalOraclePrice = function (tokenMint, useCurrentTime, price, expo, conf, ema, publishTime, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_49;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7616,6 +7158,7 @@ var PerpetualsClient = (function () {
                         _a.trys.push([1, 3, , 4]);
                         return [4, this.program.methods
                                 .setInternalOraclePrice({
+                                useCurrentTime: useCurrentTime,
                                 price: price,
                                 expo: expo,
                                 conf: conf,
@@ -7637,9 +7180,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_55 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_55);
-                        throw err_55;
+                        err_49 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_49);
+                        throw err_49;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7647,8 +7190,8 @@ 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_56;
+        this.setInternalOraclePriceBatch = function (useCurrentTime, 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_50;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7659,11 +7202,6 @@ var PerpetualsClient = (function () {
                         accountMetas = [];
                         _loop_1 = function (tokenMint) {
                             var custody = ALL_CUSTODY_CONFIGS.find(function (i) { return i.mintKey.equals(tokenMint); });
-                            accountMetas.push({
-                                pubkey: custody.custodyAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
                             accountMetas.push({
                                 pubkey: custody.intOracleAccount,
                                 isSigner: false,
@@ -7686,6 +7224,7 @@ var PerpetualsClient = (function () {
                         _a.trys.push([1, 3, , 4]);
                         return [4, this.program.methods
                                 .setInternalCurrentPrice({
+                                useCurrentTime: useCurrentTime,
                                 prices: tokenInternalPrices
                             })
                                 .accounts({
@@ -7698,9 +7237,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_56 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_56);
-                        throw err_56;
+                        err_50 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_50);
+                        throw err_50;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7709,7 +7248,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_57;
+            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_2, _i, tokenMintList_2, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_51;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7720,21 +7259,11 @@ var PerpetualsClient = (function () {
                         accountMetas = [];
                         _loop_2 = function (tokenMint) {
                             var custody = ALL_CUSTODY_CONFIGS.find(function (i) { return i.mintKey.equals(tokenMint); });
-                            accountMetas.push({
-                                pubkey: custody.custodyAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
                             accountMetas.push({
                                 pubkey: custody.intOracleAccount,
                                 isSigner: false,
                                 isWritable: true,
                             });
-                            accountMetas.push({
-                                pubkey: custody.extOracleAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
                         };
                         for (_i = 0, tokenMintList_2 = tokenMintList; _i < tokenMintList_2.length; _i++) {
                             tokenMint = tokenMintList_2[_i];
@@ -7759,9 +7288,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_57 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_57);
-                        throw err_57;
+                        err_51 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_51);
+                        throw err_51;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7770,7 +7299,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_58;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_52;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7808,8 +7337,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_58 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_58);
+                        err_52 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_52);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -7819,7 +7348,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_59;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_53;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7857,9 +7386,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_59 = _a.sent();
-                        console.log("perpClient InitStaking error:: ", err_59);
-                        throw err_59;
+                        err_53 = _a.sent();
+                        console.log("perpClient InitStaking error:: ", err_53);
+                        throw err_53;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7868,7 +7397,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_60;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_54;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7897,7 +7426,6 @@ var PerpetualsClient = (function () {
                                 transferAuthority: poolConfig.transferAuthority,
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
-                                custody: rewardCustodyConfig.custodyAccount,
                                 lpTokenMint: poolConfig.stakedLpTokenMint,
                                 compoundingVault: compoundingVault,
                                 compoundingTokenMint: compoundingTokenMint,
@@ -7913,9 +7441,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initCompoundingInstruction);
                         return [3, 4];
                     case 3:
-                        err_60 = _a.sent();
-                        console.log("perpClient initCompounding error:: ", err_60);
-                        throw err_60;
+                        err_54 = _a.sent();
+                        console.log("perpClient initCompounding error:: ", err_54);
+                        throw err_54;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7924,7 +7452,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_61;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_55;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7965,9 +7493,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initTokenVaultInstruction);
                         return [3, 4];
                     case 3:
-                        err_61 = _a.sent();
-                        console.log("perpClient InitTokenVaultInstruction error:: ", err_61);
-                        throw err_61;
+                        err_55 = _a.sent();
+                        console.log("perpClient InitTokenVaultInstruction error:: ", err_55);
+                        throw err_55;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7976,7 +7504,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_62;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_56;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8007,9 +7535,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenVaultConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_62 = _a.sent();
-                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_62);
-                        throw err_62;
+                        err_56 = _a.sent();
+                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_56);
+                        throw err_56;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8018,7 +7546,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_63;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_57;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8057,9 +7585,59 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawInstantFeeInstruction);
                         return [3, 6];
                     case 5:
-                        err_63 = _a.sent();
-                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_63);
-                        throw err_63;
+                        err_57 = _a.sent();
+                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_57);
+                        throw err_57;
+                    case 6: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.withdrawUnclaimedTokens = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawUnclaimedTokensInstruction, err_58;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 5, , 6]);
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.tokenMint, publicKey, true)];
+                    case 2:
+                        receivingTokenAccount = _a.sent();
+                        return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
+                    case 3:
+                        if (!(_a.sent())) {
+                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, poolConfig.tokenMint));
+                        }
+                        return [4, this.program.methods
+                                .withdrawUnclaimedTokens({})
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                transferAuthority: poolConfig.transferAuthority,
+                                tokenVault: poolConfig.tokenVault,
+                                tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
+                                receivingTokenAccount: receivingTokenAccount,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                receivingTokenMint: poolConfig.tokenMint,
+                            })
+                                .instruction()];
+                    case 4:
+                        withdrawUnclaimedTokensInstruction = _a.sent();
+                        instructions.push(withdrawUnclaimedTokensInstruction);
+                        return [3, 6];
+                    case 5:
+                        err_58 = _a.sent();
+                        console.log("perpClient withdrawUnclaimedTokensInstruction error:: ", err_58);
+                        throw err_58;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8068,7 +7646,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_64;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_59;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8105,9 +7683,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRevenueTokenAccountInstruction);
                         return [3, 4];
                     case 3:
-                        err_64 = _a.sent();
-                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_64);
-                        throw err_64;
+                        err_59 = _a.sent();
+                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_59);
+                        throw err_59;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8116,7 +7694,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_65;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_60;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8155,9 +7733,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_65 = _a.sent();
-                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_65);
-                        throw err_65;
+                        err_60 = _a.sent();
+                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_60);
+                        throw err_60;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8166,7 +7744,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_66;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_61;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8194,9 +7772,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenStakeLevelInstruction);
                         return [3, 4];
                     case 3:
-                        err_66 = _a.sent();
-                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_66);
-                        throw err_66;
+                        err_61 = _a.sent();
+                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_61);
+                        throw err_61;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8205,7 +7783,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_67;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_62;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8237,9 +7815,49 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_67 = _a.sent();
-                        console.log("perpClient setTokenRewardInstruction error:: ", err_67);
-                        throw err_67;
+                        err_62 = _a.sent();
+                        console.log("perpClient setTokenRewardInstruction error:: ", err_62);
+                        throw err_62;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.resizeInternalOracle = function (extOracle, tokenMint, intOracleAccount) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, resizeInternalOracleInstruction, err_63;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .resizeInternalOracle({
+                                extOracle: extOracle
+                            })
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                custodyTokenMint: tokenMint,
+                                intOracleAccount: intOracleAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                            })
+                                .instruction()];
+                    case 2:
+                        resizeInternalOracleInstruction = _a.sent();
+                        instructions.push(resizeInternalOracleInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_63 = _a.sent();
+                        console.log("perpClient resizeInternalOracleInstruction error:: ", err_63);
+                        throw err_63;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners