flash-sdk 2.3.15 → 2.3.16

package/dist/PerpetualsClient.js

@@ -341,7 +341,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addPool = function (name, maxAumUsd, permissions, metadataSymbol, metadataTitle, metadataUri, stakingFeeShareBps, vpVolumeFactor) { return __awaiter(_this, void 0, void 0, function () {
+        this.addPool = function (name, maxAumUsd, permissions, metadataSymbol, metadataTitle, metadataUri) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, this.program.methods
@@ -351,9 +351,7 @@ var PerpetualsClient = (function () {
                             permissions: permissions,
                             metadataSymbol: metadataSymbol,
                             metadataTitle: metadataTitle,
-                            metadataUri: metadataUri,
-                            stakingFeeShareBps: stakingFeeShareBps,
-                            vpVolumeFactor: vpVolumeFactor
+                            metadataUri: metadataUri
                         })
                             .accounts({
                             admin: this.provider.wallet.publicKey,
@@ -586,7 +584,7 @@ var PerpetualsClient = (function () {
                 throw new Error("exponent mistach");
             }
             var minMaxPrice = _this.getMinAndMaxOraclePriceSync(inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount);
-            var fee = _this.getFeeHelper(types_1.FeesAction.AddLiquidity, amountIn, constants_1.BN_ZERO, inputTokenCustodyAccount, minMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
+            var fee = _this.getFeeHelper(types_1.FeesAction.AddLiquidity, amountIn, constants_1.BN_ZERO, inputTokenCustodyAccount, minMaxPrice.max.price, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
             var tokenAmountUsd = minMaxPrice.min.getAssetAmountUsd((amountIn.sub(fee)), inputTokenCustodyAccount.decimals);
             var lpTokenOut;
             if (poolAumUsdMax.isZero()) {
@@ -614,13 +612,13 @@ var PerpetualsClient = (function () {
             else {
                 removeAmount = minMaxPrice.max.getTokenAmount(removeAmountUsd, outputTokenCustodyAccount.decimals);
             }
-            var fee = _this.getFeeHelper(types_1.FeesAction.RemoveLiquidity, constants_1.BN_ZERO, removeAmount, outputTokenCustodyAccount, minMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
+            var fee = _this.getFeeHelper(types_1.FeesAction.RemoveLiquidity, constants_1.BN_ZERO, removeAmount, outputTokenCustodyAccount, minMaxPrice.max.price, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
             return {
                 tokenAmountOut: removeAmount.sub(fee),
                 fee: fee,
             };
         };
-        this.getFeeHelper = function (action, amountAdd, amountRemove, inputTokenCustodyAccount, maxOraclePrice, poolAumUsdMax, poolAccount, poolConfig) {
+        this.getFeeHelper = function (action, amountAdd, amountRemove, inputTokenCustodyAccount, maxPrice, poolAumUsdMax, poolAccount, poolConfig) {
             var fees;
             switch (action) {
                 case types_1.FeesAction.AddLiquidity:
@@ -639,7 +637,7 @@ var PerpetualsClient = (function () {
             if (inputTokenCustodyAccount.fees.mode == types_1.FeesMode.Fixed) {
                 return { feeBps: fees.minFee, feeAmount: anchor_1.BN.max(amountAdd, amountRemove).mul(fees.minFee).div(new anchor_1.BN(constants_1.RATE_POWER)) };
             }
-            var newRatio = _this.getNewRatioHelper(amountAdd, amountRemove, inputTokenCustodyAccount, maxOraclePrice, poolAumUsdMax);
+            var newRatio = _this.getNewRatioHelper(amountAdd, amountRemove, inputTokenCustodyAccount, maxPrice, poolAumUsdMax);
             var inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.custodyAccount.equals(inputTokenCustodyAccount.publicKey); });
             var index = inputCustodyConfig.custodyId;
             var ratios = poolAccount.ratios[index];
@@ -676,43 +674,45 @@ var PerpetualsClient = (function () {
             return { feeBps: fee, feeAmount: feeAmount };
         };
         this.getMinAndMaxOraclePriceSync = function (price, emaPrice, custodyAccount) {
-            var maxPrice = price;
-            var minPrice = price;
+            var maxPriceUsd = price.scale_to_exponent(new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
+            var minPriceUsd = maxPriceUsd.scale_to_exponent(new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
             var divergenceBps;
             if (custodyAccount.isStable) {
-                var oneUsdPrice = OraclePrice_1.OraclePrice.from({
-                    price: new anchor_1.BN(10).pow(maxPrice.exponent.abs()),
-                    exponent: maxPrice.exponent,
-                    confidence: maxPrice.confidence,
-                    timestamp: maxPrice.timestamp
-                });
-                divergenceBps = maxPrice.getDivergenceFactor(oneUsdPrice);
+                divergenceBps = maxPriceUsd.getDeviationFactor(OraclePrice_1.OraclePrice.from({
+                    price: new anchor_1.BN(10).pow(maxPriceUsd.exponent.abs()),
+                    exponent: maxPriceUsd.exponent,
+                    confidence: maxPriceUsd.confidence,
+                    timestamp: maxPriceUsd.timestamp
+                }));
             }
             else {
-                divergenceBps = maxPrice.getDivergenceFactor(emaPrice);
+                var emaPriceInPriceDecimals = emaPrice.scale_to_exponent(new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
+                divergenceBps = maxPriceUsd.getDeviationFactor(emaPriceInPriceDecimals);
             }
             if (divergenceBps.gte(custodyAccount.oracle.maxDivergenceBps)) {
-                var confBps = (maxPrice.confidence.muln(constants_1.BPS_POWER)).div(maxPrice.price);
+                var factorBps = (divergenceBps.mul(new anchor_1.BN(constants_1.BPS_POWER))).div(custodyAccount.oracle.maxDivergenceBps);
+                var confBps = (maxPriceUsd.confidence.muln(constants_1.BPS_POWER)).div(maxPriceUsd.price);
                 if (confBps.lt(custodyAccount.oracle.maxConfBps)) {
-                    minPrice.price = maxPrice.price.sub(maxPrice.confidence);
-                    maxPrice.price = maxPrice.price.add(maxPrice.confidence);
+                    var confFactor = anchor_1.BN.min(factorBps, new anchor_1.BN(50000));
+                    var confScale = (maxPriceUsd.confidence.mul(confFactor)).div(new anchor_1.BN(constants_1.BPS_POWER));
+                    minPriceUsd.price = maxPriceUsd.price.sub(confScale);
                     return {
-                        min: minPrice,
-                        max: maxPrice
+                        min: minPriceUsd,
+                        max: maxPriceUsd
                     };
                 }
                 else {
-                    minPrice.price = maxPrice.price.sub(maxPrice.confidence);
+                    minPriceUsd.price = maxPriceUsd.price.sub(maxPriceUsd.confidence);
                     return {
-                        min: minPrice,
-                        max: maxPrice
+                        min: minPriceUsd,
+                        max: maxPriceUsd
                     };
                 }
             }
             else {
                 return {
-                    min: maxPrice,
-                    max: maxPrice
+                    min: maxPriceUsd,
+                    max: maxPriceUsd
                 };
             }
         };
@@ -720,10 +720,10 @@ var PerpetualsClient = (function () {
             var minPrice = price;
             var divergenceBps;
             if (custodyAccount.isStable) {
-                divergenceBps = price.getDivergenceFactor(OraclePrice_1.OraclePrice.from({ price: new anchor_1.BN(10).pow(price.exponent.abs()), exponent: price.exponent, confidence: price.confidence, timestamp: price.timestamp }));
+                divergenceBps = price.getDeviationFactor(OraclePrice_1.OraclePrice.from({ price: new anchor_1.BN(10).pow(price.exponent.abs()), exponent: price.exponent, confidence: price.confidence, timestamp: price.timestamp }));
             }
             else {
-                divergenceBps = price.getDivergenceFactor(emaPrice);
+                divergenceBps = price.getDeviationFactor(emaPrice);
             }
             if (divergenceBps.gte(custodyAccount.oracle.maxDivergenceBps)) {
                 var factorBps = (divergenceBps.mul(new anchor_1.BN(constants_1.BPS_POWER))).div(custodyAccount.oracle.maxDivergenceBps);
@@ -757,10 +757,10 @@ var PerpetualsClient = (function () {
             }
             var deviation;
             if (custodyAccount.isStable) {
-                deviation = price.getDivergenceFactor(OraclePrice_1.OraclePrice.from({ price: new anchor_1.BN(10).pow(price.exponent.abs()), exponent: price.exponent, confidence: price.confidence, timestamp: price.timestamp }));
+                deviation = price.getDeviationFactor(OraclePrice_1.OraclePrice.from({ price: new anchor_1.BN(10).pow(price.exponent.abs()), exponent: price.exponent, confidence: price.confidence, timestamp: price.timestamp }));
             }
             else {
-                deviation = price.getDivergenceFactor(emaPrice);
+                deviation = price.getDeviationFactor(emaPrice);
             }
             if (deviation.gte(custodyAccount.oracle.maxDivergenceBps)) {
                 var confFactor = (price.confidence.muln(constants_1.BPS_POWER)).div(price.price);
@@ -802,10 +802,11 @@ var PerpetualsClient = (function () {
                     finalCollateralAmount = swapAmountOut;
                 }
             }
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount);
+            var entryPriceUsdBN = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount);
             var openFeeUsd = constants_1.BN_ZERO;
             if (sizeDeltaAmount != constants_1.BN_ZERO) {
-                var sizeDeltaUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetTokenCustodyAccount.decimals);
+                var newEntryPriceOracle = new OraclePrice_1.OraclePrice({ price: entryPriceUsdBN, exponent: new anchor_1.BN(constants_1.USD_DECIMALS).neg(), confidence: targetTokenPrice.confidence, timestamp: targetTokenPrice.timestamp });
+                var sizeDeltaUsd = newEntryPriceOracle.getAssetAmountUsd(sizeDeltaAmount, targetTokenCustodyAccount.decimals);
                 openFeeUsd = sizeDeltaUsd.mul(targetTokenCustodyAccount.fees.openPosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             }
             if (positionAccount === null) {
@@ -819,14 +820,16 @@ var PerpetualsClient = (function () {
                     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);
+                })
+                    .scale_to_exponent(new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
+                entryPriceUsdBN = _this.getAveragePriceSync(positionEntryPrice.price, positionAccount.sizeAmount, entryPriceUsdBN, 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 sizeAmount = positionAccount.sizeAmount.add(sizeDeltaAmount);
+            var entryOraclePrice = new OraclePrice_1.OraclePrice({ price: entryPriceUsdBN, exponent: new anchor_1.BN(constants_1.USD_DECIMALS).neg(), confidence: targetTokenPrice.confidence, timestamp: targetTokenPrice.timestamp });
             var sizeAmountUsd = entryOraclePrice.getAssetAmountUsd(sizeAmount, targetTokenCustodyAccount.decimals);
             if (currentCollateralUsdIncludingPnl.gt(constants_1.BN_ZERO)) {
                 return sizeAmountUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentCollateralUsdIncludingPnl);
@@ -840,11 +843,12 @@ var PerpetualsClient = (function () {
             if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
                 throw new Error("Delta Amounts cannot be negative.");
             }
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount);
+            var entryPriceUsdBN = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount);
+            var oracleEntryPrice = OraclePrice_1.OraclePrice.from({ price: entryPriceUsdBN, exponent: new anchor_1.BN(-1 * constants_1.USD_DECIMALS), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
             if (positionAccount === null) {
                 var data = __assign({}, types_1.DEFAULT_POSITION);
                 positionAccount = PositionAccount_1.PositionAccount.from(web3_js_1.PublicKey.default, data);
-                var sizeUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
+                var sizeUsd = oracleEntryPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
                 positionAccount.sizeUsd = sizeUsd;
                 positionAccount.sizeDecimals = targetCustodyAccount.decimals;
                 positionAccount.collateralDecimals = collateralCustodyAccount.decimals;
@@ -857,15 +861,17 @@ var PerpetualsClient = (function () {
                     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);
+                })
+                    .scale_to_exponent(new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
+                entryPriceUsdBN = _this.getAveragePriceSync(positionEntryPrice.price, positionAccount.sizeAmount, entryPriceUsdBN, sizeDeltaAmount);
+                var sizeDeltaUsd = oracleEntryPrice.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, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount);
+            var liquidationPrice = _this.getLiquidationPriceSync(positionAccount.collateralAmount, positionAccount.sizeAmount, entryPriceUsdBN, lockFeeUsd, marketCorrelation, side, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount);
+            var entryOraclePrice = new OraclePrice_1.OraclePrice({ price: entryPriceUsdBN, exponent: new anchor_1.BN(constants_1.USD_DECIMALS).neg(), confidence: targetPrice.confidence, timestamp: targetPrice.timestamp });
             var sizeAmountUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
             var collateralTokenMinOraclePrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
             var feeUsd = constants_1.BN_ZERO;
@@ -888,7 +894,7 @@ var PerpetualsClient = (function () {
                 }
             }
             return {
-                entryOraclePrice: entryOraclePrice,
+                entryPrice: entryPriceUsdBN,
                 feeUsd: feeUsd,
                 feeAmount: feeAmount,
                 feeUsdAfterDiscount: feeUsdAfterDiscount,
@@ -897,12 +903,11 @@ var PerpetualsClient = (function () {
             };
         };
         this.getEntryPriceUsdSync = function (side, targetPrice, targetEmaPrice, targetCustodyAccount) {
-            var _a = _this.getMinAndMaxOraclePriceSync(targetPrice, targetEmaPrice, targetCustodyAccount), minPrice = _a.min, maxPrice = _a.max;
+            var _a = _this.getMinAndMaxPriceSync(targetPrice, targetEmaPrice, targetCustodyAccount), minPrice = _a.min, maxPrice = _a.max;
             var entryPriceBN = (0, types_1.isVariant)(side, 'long') === types_1.Side.Long ?
-                maxPrice.price.add(maxPrice.price.mul(targetCustodyAccount.pricing.tradeSpreadLong).div(new anchor_1.BN(constants_1.BPS_POWER))) :
-                minPrice.price.sub(minPrice.price.mul(targetCustodyAccount.pricing.tradeSpreadShort).div(new anchor_1.BN(constants_1.BPS_POWER)));
-            var entryOraclePrice = OraclePrice_1.OraclePrice.from({ price: entryPriceBN, exponent: maxPrice.exponent, confidence: maxPrice.confidence, timestamp: maxPrice.timestamp });
-            return entryOraclePrice;
+                maxPrice.add(maxPrice.mul(targetCustodyAccount.pricing.tradeSpreadLong).div(new anchor_1.BN(constants_1.BPS_POWER))) :
+                minPrice.sub(minPrice.mul(targetCustodyAccount.pricing.tradeSpreadShort).div(new anchor_1.BN(constants_1.BPS_POWER)));
+            return entryPriceBN;
         };
         this.getExitFeeSync = function (positionAccount, targetCustody, collateralCustodyAccount, collateralPrice, collateralEmaPrice, discountBps) {
             if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
@@ -949,11 +954,12 @@ var PerpetualsClient = (function () {
             }
             var positionEntryOraclePrice = new OraclePrice_1.OraclePrice({
                 price: positionAccount.entryPrice.price, exponent: new anchor_1.BN(positionAccount.entryPrice.exponent), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO
-            });
+            }).scale_to_exponent(new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
+            var positionEntryPriceUsd = positionEntryOraclePrice.price;
             resultingPositionAccount.sizeUsd = positionEntryOraclePrice.getAssetAmountUsd(resultingPositionAccount.sizeAmount, targetCustodyAccount.decimals);
-            var liquidationPrice = _this.getLiquidationPriceSync(resultingPositionAccount.collateralAmount, resultingPositionAccount.sizeAmount, positionEntryOraclePrice, lockAndUnsettledFeeUsd, marketCorrelation, side, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount);
+            var liquidationPrice = _this.getLiquidationPriceSync(resultingPositionAccount.collateralAmount, resultingPositionAccount.sizeAmount, positionEntryPriceUsd, lockAndUnsettledFeeUsd, marketCorrelation, side, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount);
             return {
-                exitOraclePrice: exitOraclePrice,
+                exitPrice: exitOraclePrice.scale_to_exponent(new anchor_1.BN(-1 * constants_1.USD_DECIMALS)).price,
                 borrowFeeUsd: lockAndUnsettledFeeUsd,
                 borrowFeeAmount: lockAndUnsettledFee,
                 exitFeeUsd: exitFeeUsd,
@@ -983,8 +989,8 @@ var PerpetualsClient = (function () {
             if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
             var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount);
-            var entryPriceUsdUi = new bignumber_js_1.default(entryOraclePrice.toUiPrice(constants_1.ORACLE_EXPONENT));
+            var entryPriceUsdBN = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount);
+            var entryPriceUsdUi = new bignumber_js_1.default(entryPriceUsdBN.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 openPosFeeRateUi = new bignumber_js_1.default(targetCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
@@ -1010,8 +1016,8 @@ var PerpetualsClient = (function () {
             }
             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 entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount);
-            var entryPriceUsdUi = new bignumber_js_1.default(entryOraclePrice.toUiPrice(constants_1.ORACLE_EXPONENT));
+            var entryPriceUsdBN = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount);
+            var entryPriceUsdUi = new bignumber_js_1.default(entryPriceUsdBN.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
             var collateralAmtMinUsdUi = new bignumber_js_1.default(finalCollateralAmount.toString()).dividedBy(Math.pow(10, collateralTokenCustodyAccount.decimals))
                 .multipliedBy(collateralTokenMinPriceUi);
             var openPosFeeRateUi = new bignumber_js_1.default(targetTokenCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
@@ -1028,8 +1034,8 @@ var PerpetualsClient = (function () {
             if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
             var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount);
-            var entryPriceUsdUi = new bignumber_js_1.default(entryOraclePrice.toUiPrice(constants_1.ORACLE_EXPONENT));
+            var entryPriceUsdBN = _this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, targetCustodyAccount);
+            var entryPriceUsdUi = new bignumber_js_1.default(entryPriceUsdBN.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
             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));
@@ -1044,8 +1050,8 @@ var PerpetualsClient = (function () {
         this.getCollateralAmountWithSwapSync = function (sizeAmount, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, swapOutTokenPrice, swapOutTokenEmaPrice, swapOutTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, swapPoolAumUsdMax, poolConfigPosition, poolConfigSwap) {
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount).min;
             var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
-            var entryOraclePrice = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount);
-            var entryPriceUsdUi = new bignumber_js_1.default(entryOraclePrice.toUiPrice(constants_1.ORACLE_EXPONENT));
+            var entryPriceUsdBN = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount);
+            var entryPriceUsdUi = new bignumber_js_1.default(entryPriceUsdBN.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
             var openPosFeeRateUi = new bignumber_js_1.default(targetTokenCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
             var sizeAmountUi = new bignumber_js_1.default(sizeAmount.toString()).dividedBy(Math.pow(10, targetTokenCustodyAccount.decimals));
             var sizeUsdUi = entryPriceUsdUi.multipliedBy(sizeAmountUi);
@@ -1152,7 +1158,7 @@ var PerpetualsClient = (function () {
                 newPosition.collateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(newPosition.collateralAmount, 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, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, newPosition);
+                var finalLiquidationPrice = _this.getLiquidationPriceSync(newPosition.collateralAmount, newPosition.sizeAmount, entryPrice.scale_to_exponent(new anchor_1.BN(constants_1.USD_DECIMALS).neg()).price, finalInterestUsd, marketCorrelation, side, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, 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 newExitFee = _this.getExitFeeSync(newPosition, targetCustodyAccount, collateralCustodyAccount, collateralPrice, collateralEmaPrice);
@@ -1172,7 +1178,7 @@ var PerpetualsClient = (function () {
             else {
                 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, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, newPosition);
+                var finalLiquidationPrice = _this.getLiquidationPriceSync(newPosition.collateralAmount, newPosition.sizeAmount, entryPrice.scale_to_exponent(new anchor_1.BN(constants_1.USD_DECIMALS).neg()).price, finalInterestUsd, marketCorrelation, side, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, 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 exitFee = _this.getExitFeeSync(newPosition, targetCustodyAccount, collateralCustodyAccount, collateralPrice, collateralEmaPrice);
@@ -1273,133 +1279,73 @@ var PerpetualsClient = (function () {
             lockFeeUsd = lockFeeUsd.add(position.unsettledFeesUsd);
             return lockFeeUsd;
         };
-        this.getLiquidationPriceSync = function (collateralAmount, sizeAmount, entryOraclePrice, lockAndUnsettledFeeUsd, marketCorrelation, side, custodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, 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
-            });
+        this.getLiquidationPriceSync = function (collateralAmount, sizeAmount, entryPriceUsd, lockAndUnsettledFeeUsd, marketCorrelation, side, custodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount) {
             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)));
+                return constants_1.BN_ZERO;
             }
             var exitFeeUsd = positionAccount.sizeUsd.mul(custodyAccount.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(custodyAccount.pricing.maxLeverage).add(unsettledLossUsd);
-            var assetsUsd = constants_1.BN_ZERO;
-            if (marketCorrelation) {
-                assetsUsd = positionAccount.collateralUsd;
+            var liablityThresholdUsd = positionAccount.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(custodyAccount.pricing.maxLeverage).add(unsettledLossUsd);
+            var collateralMinPriceOracle = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
+            var currentCollateralUsd = collateralMinPriceOracle.getAssetAmountUsd(collateralAmount, collateralCustodyAccount.decimals);
+            var nominalSolvency;
+            if (currentCollateralUsd.gt(liablityThresholdUsd)) {
+                nominalSolvency = true;
             }
             else {
-                var collateralMinPriceOracle = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
-                assetsUsd = collateralMinPriceOracle.getAssetAmountUsd(collateralAmount, collateralCustodyAccount.decimals);
+                nominalSolvency = false;
             }
-            var liquidationPrice;
-            if (marketCorrelation && (0, types_1.isVariant)(side, 'long')) {
-                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(collateralAmount)),
-                    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));
+            var remainingMarginUsd, requiredMarginUsd;
+            if (nominalSolvency) {
+                remainingMarginUsd = currentCollateralUsd.sub(liablityThresholdUsd);
+                requiredMarginUsd = constants_1.BN_ZERO;
             }
             else {
-                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),
-                        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
-                        });
-                    }
+                remainingMarginUsd = constants_1.BN_ZERO;
+                requiredMarginUsd = liablityThresholdUsd.sub(currentCollateralUsd);
+            }
+            var liquidationPrice = constants_1.BN_ZERO;
+            if ((0, types_1.isVariant)(side, 'long')) {
+                if (marketCorrelation) {
+                    liquidationPrice = positionAccount.sizeUsd.add(liablityThresholdUsd).mul(new anchor_1.BN(10).pow(new anchor_1.BN(positionAccount.sizeDecimals))).div(sizeAmount.add(collateralAmount));
+                }
+                else if (nominalSolvency) {
+                    var priceDiscount = (remainingMarginUsd.mul(new anchor_1.BN(10).pow(new anchor_1.BN(positionAccount.sizeDecimals)))).div(sizeAmount);
+                    liquidationPrice = entryPriceUsd.sub(priceDiscount);
                 }
                 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),
-                        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
-                        });
-                    }
+                    var pricePremium = (requiredMarginUsd.mul(new anchor_1.BN(10).pow(new anchor_1.BN(positionAccount.sizeDecimals)))).div(sizeAmount);
+                    liquidationPrice = entryPriceUsd.add(pricePremium);
                 }
             }
-            return liquidationPrice.price.isNeg() ? zeroOraclePrice : liquidationPrice;
+            else {
+                if (nominalSolvency) {
+                    var pricePremium = (remainingMarginUsd.mul(new anchor_1.BN(10).pow(new anchor_1.BN(positionAccount.sizeDecimals)))).div(sizeAmount);
+                    liquidationPrice = entryPriceUsd.add(pricePremium);
+                }
+                else {
+                    var priceDiscount = (requiredMarginUsd.mul(new anchor_1.BN(10).pow(new anchor_1.BN(positionAccount.sizeDecimals)))).div(sizeAmount);
+                    liquidationPrice = entryPriceUsd.sub(priceDiscount);
+                }
+            }
+            return liquidationPrice.isNeg() ? constants_1.BN_ZERO : liquidationPrice;
         };
-        this.getMaxProfitPriceSync = function (entryPrice, marketCorrelation, side, 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
-            });
+        this.getMaxProfitPriceSync = function (entryPriceUsd, marketCorrelation, side, positionAccount) {
             if (positionAccount.sizeAmount.isZero()) {
-                return zeroOraclePrice;
+                return constants_1.BN_ZERO;
             }
-            var priceDiffProfit = OraclePrice_1.OraclePrice.from({
-                price: positionAccount.lockedUsd.mul(new anchor_1.BN(10).pow(new anchor_1.BN(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(positionAccount.entryPrice.exponent));
-            var maxProfitPrice;
+            var priceDiffProfit = positionAccount.lockedUsd.mul(new anchor_1.BN(10).pow(new anchor_1.BN(positionAccount.sizeDecimals))).div(positionAccount.sizeAmount);
+            var maxProfitPrice = constants_1.BN_ZERO;
             if ((0, types_1.isVariant)(side, 'long')) {
                 if (marketCorrelation) {
-                    return zeroOraclePrice;
+                    return constants_1.BN_ZERO;
                 }
-                maxProfitPrice = OraclePrice_1.OraclePrice.from({
-                    price: entryPrice.price.add(priceDiffProfit.price),
-                    exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
-                    confidence: constants_1.BN_ZERO,
-                    timestamp: constants_1.BN_ZERO
-                });
+                maxProfitPrice = entryPriceUsd.add(priceDiffProfit);
             }
             else {
-                maxProfitPrice = OraclePrice_1.OraclePrice.from({
-                    price: entryPrice.price.sub(priceDiffProfit.price),
-                    exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
-                    confidence: constants_1.BN_ZERO,
-                    timestamp: constants_1.BN_ZERO
-                });
+                maxProfitPrice = entryPriceUsd.sub(priceDiffProfit);
             }
-            return maxProfitPrice.price.isNeg() ? zeroOraclePrice : maxProfitPrice;
+            return maxProfitPrice.isNeg() ? constants_1.BN_ZERO : maxProfitPrice;
         };
         this.getPnlSync = function (positionAccount, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, delay, poolConfig) {
             if (positionAccount.sizeUsd.isZero() || positionAccount.entryPrice.price.isZero()) {
@@ -1409,64 +1355,61 @@ var PerpetualsClient = (function () {
                 };
             }
             var side = poolConfig.getMarketConfigByPk(positionAccount.market).side;
-            var exitOraclePrice = _this.getExitOraclePriceSync(side, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount);
+            var exitPrice = _this.getExitPriceSync(side, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount);
             var collateralMinPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
-            var priceDiffProfit, priceDiffLoss;
+            var priceDiffProfitUsd, priceDiffLossUsd;
             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
-            });
-            if (!exitOraclePrice.exponent.eq(positionEntryPrice.exponent)) {
-                throw new Error("exponent mistach");
-            }
+            })
+                .scale_to_exponent(new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
             if ((0, types_1.isVariant)(side, 'long')) {
-                if (exitOraclePrice.price.gt(positionEntryPrice.price)) {
+                if (exitPrice.gt(positionEntryPrice.price)) {
                     if (currentTimestamp.gt(positionAccount.updateTime.add(delay))) {
-                        priceDiffProfit = new OraclePrice_1.OraclePrice({ price: exitOraclePrice.price.sub(positionEntryPrice.price), exponent: exitOraclePrice.exponent, confidence: exitOraclePrice.confidence, timestamp: constants_1.BN_ZERO });
-                        priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                        priceDiffProfitUsd = exitPrice.sub(positionEntryPrice.price);
+                        priceDiffLossUsd = constants_1.BN_ZERO;
                     }
                     else {
-                        priceDiffProfit = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-                        priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                        priceDiffProfitUsd = constants_1.BN_ZERO;
+                        priceDiffLossUsd = constants_1.BN_ZERO;
                     }
                 }
                 else {
-                    priceDiffProfit = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-                    priceDiffLoss = new OraclePrice_1.OraclePrice({ price: positionEntryPrice.price.sub(exitOraclePrice.price), exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                    priceDiffProfitUsd = constants_1.BN_ZERO;
+                    priceDiffLossUsd = positionEntryPrice.price.sub(exitPrice);
                 }
             }
             else {
-                if (exitOraclePrice.price.lt(positionEntryPrice.price)) {
+                if (exitPrice.lt(positionEntryPrice.price)) {
                     if (currentTimestamp.gt(positionAccount.updateTime.add(delay))) {
-                        priceDiffProfit = new OraclePrice_1.OraclePrice({ price: positionEntryPrice.price.sub(exitOraclePrice.price), exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-                        priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                        priceDiffProfitUsd = positionEntryPrice.price.sub(exitPrice);
+                        priceDiffLossUsd = constants_1.BN_ZERO;
                     }
                     else {
-                        priceDiffProfit = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-                        priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                        priceDiffProfitUsd = constants_1.BN_ZERO;
+                        priceDiffLossUsd = constants_1.BN_ZERO;
                     }
                 }
                 else {
-                    priceDiffProfit = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-                    priceDiffLoss = new OraclePrice_1.OraclePrice({ price: exitOraclePrice.price.sub(positionEntryPrice.price), exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                    priceDiffProfitUsd = constants_1.BN_ZERO;
+                    priceDiffLossUsd = exitPrice.sub(positionEntryPrice.price);
                 }
             }
             ;
-            if (!priceDiffProfit.exponent.eq(priceDiffLoss.exponent)) {
-                throw new Error("exponent mistach");
-            }
-            if (priceDiffProfit.price.gt(constants_1.BN_ZERO)) {
+            var priceDiffProfitOracle = new OraclePrice_1.OraclePrice({ price: priceDiffProfitUsd, exponent: new anchor_1.BN(constants_1.USD_DECIMALS).neg(), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+            var priceDiffLossOracle = new OraclePrice_1.OraclePrice({ price: priceDiffLossUsd, exponent: new anchor_1.BN(constants_1.USD_DECIMALS).neg(), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+            if (priceDiffProfitUsd.gt(constants_1.BN_ZERO)) {
                 return {
-                    profitUsd: anchor_1.BN.min(priceDiffProfit.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals), collateralMinPrice.getAssetAmountUsd(positionAccount.lockedAmount, positionAccount.lockedDecimals)),
+                    profitUsd: anchor_1.BN.min(priceDiffProfitOracle.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals), collateralMinPrice.getAssetAmountUsd(positionAccount.lockedAmount, positionAccount.lockedDecimals)),
                     lossUsd: constants_1.BN_ZERO,
                 };
             }
             else {
                 return {
                     profitUsd: constants_1.BN_ZERO,
-                    lossUsd: priceDiffLoss.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
+                    lossUsd: priceDiffLossOracle.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
                 };
             }
         };
@@ -1482,46 +1425,31 @@ var PerpetualsClient = (function () {
                     feeOut: constants_1.BN_ZERO,
                 };
             }
-            var newInputTokenPrice, newInputTokenEmaPrice;
-            var newOutputTokenPrice, newOutputTokenEmaPrice;
-            if (inputTokenPrice.exponent.lte(outputTokenPrice.exponent)) {
-                newInputTokenPrice = inputTokenPrice;
-                newInputTokenEmaPrice = inputTokenEmaPrice;
-                newOutputTokenPrice = outputTokenPrice.scale_to_exponent(inputTokenPrice.exponent);
-                newOutputTokenEmaPrice = outputTokenEmaPrice.scale_to_exponent(inputTokenPrice.exponent);
-            }
-            else {
-                newInputTokenPrice = inputTokenPrice.scale_to_exponent(outputTokenPrice.exponent);
-                newInputTokenEmaPrice = inputTokenEmaPrice.scale_to_exponent(outputTokenPrice.exponent);
-                newOutputTokenPrice = outputTokenPrice;
-                newOutputTokenEmaPrice = outputTokenEmaPrice;
-            }
-            if (!newInputTokenPrice.exponent.eq(newOutputTokenPrice.exponent)) {
-                throw "Exponents mistmatch ".concat(newInputTokenPrice.exponent.toNumber(), " != ").concat(newOutputTokenPrice.exponent.toNumber());
+            if (!inputTokenPrice.exponent.eq(outputTokenPrice.exponent) ||
+                !inputTokenEmaPrice.exponent.eq(outputTokenEmaPrice.exponent)) {
+                throw new Error("exponent mismatch");
             }
-            var inputMinMaxPrice = _this.getMinAndMaxOraclePriceSync(newInputTokenPrice, newInputTokenEmaPrice, inputTokenCustodyAccount);
-            var outputMinMaxPrice = _this.getMinAndMaxOraclePriceSync(newOutputTokenPrice, newOutputTokenEmaPrice, outputTokenCustodyAccount);
+            var inputMinMaxPrice = _this.getMinAndMaxOraclePriceSync(inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount);
+            var outputMinMaxPrice = _this.getMinAndMaxOraclePriceSync(outputTokenPrice, outputTokenEmaPrice, outputTokenCustodyAccount);
             var pairPrice;
-            var inputTokenAmount;
-            var outputTokenAmount;
+            var swapAmount;
             var feeIn;
             var feeOut;
             if (amountIn.isZero()) {
                 if (inputTokenCustodyAccount.isStable &&
                     inputMinMaxPrice.min != inputMinMaxPrice.max &&
-                    inputTokenCustodyAccount.depegAdjustment) {
+                    inputMinMaxPrice.max.price.lt(new anchor_1.BN(10).pow(inputMinMaxPrice.max.exponent))) {
                     pairPrice = outputMinMaxPrice.min.price;
                 }
                 else {
                     pairPrice = outputMinMaxPrice.min.price.mul(new anchor_1.BN(10).pow(outputMinMaxPrice.min.exponent)).div(inputMinMaxPrice.max.price);
                 }
                 var swapPrice = pairPrice.sub(pairPrice.mul(outputTokenCustodyAccount.pricing.swapSpread).div(new anchor_1.BN(constants_1.BPS_POWER)));
-                inputTokenAmount = (0, utils_1.checkedDecimalMul)(amountOut, new anchor_1.BN(-1 * outputTokenCustodyAccount.decimals), swapPrice, inputMinMaxPrice.min.exponent, new anchor_1.BN(-1 * inputTokenCustodyAccount.decimals));
-                feeIn = _this.getFeeHelper(types_1.FeesAction.SwapIn, inputTokenAmount, constants_1.BN_ZERO, inputTokenCustodyAccount, inputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
-                feeOut = _this.getFeeHelper(types_1.FeesAction.SwapOut, constants_1.BN_ZERO, amountOut, outputTokenCustodyAccount, outputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
-                var swapAmount = (0, utils_1.checkedDecimalMul)(amountOut.add(feeOut), new anchor_1.BN(-1 * outputTokenCustodyAccount.decimals), swapPrice, inputMinMaxPrice.min.exponent, new anchor_1.BN(-1 * inputTokenCustodyAccount.decimals)).add(feeIn);
+                swapAmount = (0, utils_1.checkedDecimalMul)(amountOut, new anchor_1.BN(-1 * outputTokenCustodyAccount.decimals), swapPrice, inputMinMaxPrice.min.exponent, new anchor_1.BN(-1 * inputTokenCustodyAccount.decimals));
+                feeIn = _this.getFeeHelper(types_1.FeesAction.SwapIn, swapAmount, constants_1.BN_ZERO, inputTokenCustodyAccount, inputMinMaxPrice.max.price, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
+                feeOut = _this.getFeeHelper(types_1.FeesAction.SwapOut, constants_1.BN_ZERO, amountOut, outputTokenCustodyAccount, outputMinMaxPrice.max.price, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
                 return {
-                    minAmountIn: swapAmount,
+                    minAmountIn: swapAmount.add(feeIn),
                     minAmountOut: constants_1.BN_ZERO,
                     feeIn: feeIn,
                     feeOut: feeOut,
@@ -1530,20 +1458,19 @@ var PerpetualsClient = (function () {
             else {
                 if (outputTokenCustodyAccount.isStable &&
                     outputMinMaxPrice.min != outputMinMaxPrice.max &&
-                    outputTokenCustodyAccount.depegAdjustment) {
+                    outputMinMaxPrice.max.price.lt(new anchor_1.BN(10).pow(outputMinMaxPrice.max.exponent))) {
                     pairPrice = inputMinMaxPrice.min.price;
                 }
                 else {
                     pairPrice = inputMinMaxPrice.min.price.mul(new anchor_1.BN(10).pow(inputMinMaxPrice.min.exponent)).div(outputMinMaxPrice.max.price);
                 }
                 var swapPrice = pairPrice.sub(pairPrice.mul(inputTokenCustodyAccount.pricing.swapSpread).div(new anchor_1.BN(constants_1.BPS_POWER)));
-                outputTokenAmount = (0, utils_1.checkedDecimalMul)(amountIn, new anchor_1.BN(-1 * inputTokenCustodyAccount.decimals), swapPrice, inputMinMaxPrice.min.exponent, new anchor_1.BN(-1 * outputTokenCustodyAccount.decimals));
-                feeIn = _this.getFeeHelper(types_1.FeesAction.SwapIn, amountIn, constants_1.BN_ZERO, inputTokenCustodyAccount, inputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
-                feeOut = _this.getFeeHelper(types_1.FeesAction.SwapOut, constants_1.BN_ZERO, outputTokenAmount, outputTokenCustodyAccount, outputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
-                var swapAmount = (0, utils_1.checkedDecimalMul)(amountIn.sub(feeIn), new anchor_1.BN(-1 * inputTokenCustodyAccount.decimals), swapPrice, inputMinMaxPrice.min.exponent, new anchor_1.BN(-1 * outputTokenCustodyAccount.decimals)).sub(feeOut);
+                swapAmount = (0, utils_1.checkedDecimalMul)(amountIn, new anchor_1.BN(-1 * inputTokenCustodyAccount.decimals), swapPrice, inputMinMaxPrice.min.exponent, new anchor_1.BN(-1 * outputTokenCustodyAccount.decimals));
+                feeIn = _this.getFeeHelper(types_1.FeesAction.SwapIn, amountIn, constants_1.BN_ZERO, inputTokenCustodyAccount, inputMinMaxPrice.max.price, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
+                feeOut = _this.getFeeHelper(types_1.FeesAction.SwapOut, constants_1.BN_ZERO, swapAmount, outputTokenCustodyAccount, outputMinMaxPrice.max.price, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
                 return {
                     minAmountIn: constants_1.BN_ZERO,
-                    minAmountOut: swapAmount,
+                    minAmountOut: swapAmount.sub(feeOut),
                     feeIn: feeIn,
                     feeOut: feeOut,
                 };
@@ -2926,7 +2853,7 @@ var PerpetualsClient = (function () {
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
                                 custody: payTokenCustodyConfig.custodyAccount,
-                                custodyOracleAccount: payTokenCustodyConfig.oracleAddress,
+                                custodyOracleAccount: this.useCustomOracle ? payTokenCustodyConfig.customOracleAddress : payTokenCustodyConfig.oracleAddress,
                                 custodyTokenAccount: payTokenCustodyConfig.tokenAccount,
                                 lpTokenMint: poolConfig.lpTokenMint,
                                 eventAuthority: this.eventAuthority.publicKey,
@@ -4150,8 +4077,9 @@ var PerpetualsClient = (function () {
             this.getMarketPk(targetCustody, collateralCustody, side),
         ]).publicKey;
     };
-    PerpetualsClient.prototype.getNewRatioHelper = function (amountAdd, amountRemove, custodyAccount, maxPriceOracle, poolAumUsdMax) {
+    PerpetualsClient.prototype.getNewRatioHelper = function (amountAdd, amountRemove, custodyAccount, maxPrice, poolAumUsdMax) {
         var newRatio = constants_1.BN_ZERO;
+        var maxPriceOracle = OraclePrice_1.OraclePrice.from({ price: new anchor_1.BN(maxPrice), exponent: new anchor_1.BN(-1 * constants_1.USD_DECIMALS), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
         var tokenAumUsd = maxPriceOracle.getAssetAmountUsd(custodyAccount.assets.owned, custodyAccount.decimals);
         if (amountAdd.gt(constants_1.BN_ZERO) && amountRemove.gt(constants_1.BN_ZERO)) {
             throw new Error("cannot add and remove liquidity together");
@@ -4174,16 +4102,50 @@ var PerpetualsClient = (function () {
         }
         return newRatio;
     };
+    PerpetualsClient.prototype.getPriceAfterSlippageOld = function (isEntry, slippageBps, targetPrice, targetEmaPrice, side, custody) {
+        if (isEntry) {
+            var current_price_usd = this.getEntryPriceUsdSync(side, targetPrice, targetEmaPrice, custody);
+            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price_usd, new anchor_1.BN(-1 * constants_1.USD_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
+            if ((0, types_1.isVariant)(side, 'long')) {
+                return { price: current_price_usd.add(spread_i), exponent: targetPrice.exponent.toNumber() };
+            }
+            else {
+                if (spread_i.lt(current_price_usd)) {
+                    return { price: current_price_usd.sub(spread_i), exponent: targetPrice.exponent.toNumber() };
+                }
+                else {
+                    return { price: constants_1.BN_ZERO, exponent: targetPrice.exponent.toNumber() };
+                }
+                ;
+            }
+        }
+        else {
+            var current_price = this.getExitPriceSync(side, targetPrice, targetEmaPrice, custody);
+            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.USD_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
+            if ((0, types_1.isVariant)(side, 'long')) {
+                if (spread_i.lt(current_price)) {
+                    return { price: current_price.sub(spread_i), exponent: targetPrice.exponent.toNumber() };
+                }
+                else {
+                    return { price: constants_1.BN_ZERO, exponent: targetPrice.exponent.toNumber() };
+                }
+                ;
+            }
+            else {
+                return { price: current_price.add(spread_i), exponent: targetPrice.exponent.toNumber() };
+            }
+        }
+    };
     PerpetualsClient.prototype.getPriceAfterSlippage = function (isEntry, slippageBps, targetPrice, side) {
         if (isEntry) {
-            var currentPrice = targetPrice.price;
-            var spread_i = (0, utils_1.checkedDecimalCeilMul)(currentPrice, targetPrice.exponent, slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), targetPrice.exponent);
+            var current_price = targetPrice.price;
+            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.USD_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
             if ((0, types_1.isVariant)(side, 'long')) {
-                return { price: currentPrice.add(spread_i), exponent: targetPrice.exponent.toNumber() };
+                return { price: current_price.add(spread_i), exponent: targetPrice.exponent.toNumber() };
             }
             else {
-                if (spread_i.lt(currentPrice)) {
-                    return { price: currentPrice.sub(spread_i), exponent: targetPrice.exponent.toNumber() };
+                if (spread_i.lt(current_price)) {
+                    return { price: current_price.sub(spread_i), exponent: targetPrice.exponent.toNumber() };
                 }
                 else {
                     return { price: constants_1.BN_ZERO, exponent: targetPrice.exponent.toNumber() };
@@ -4193,7 +4155,7 @@ var PerpetualsClient = (function () {
         }
         else {
             var current_price = targetPrice.price;
-            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, targetPrice.exponent, slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), targetPrice.exponent);
+            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.USD_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
             if ((0, types_1.isVariant)(side, 'long')) {
                 if (spread_i.lt(current_price)) {
                     return { price: current_price.sub(spread_i), exponent: targetPrice.exponent.toNumber() };