flash-sdk 9.0.2-alpha.0 → 9.0.2-alpha.10

package/dist/OraclePrice.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { ContractOraclePrice } from "./types";
 export declare class OraclePrice {

package/dist/OrderAccount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { LimitOrder, Order, TriggerOrder } from "./types";

package/dist/PerpetualsClient.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="bn.js" />
-/// <reference types="node" />
 import { Program, AnchorProvider, BN } from "@coral-xyz/anchor";
 import { PublicKey, TransactionInstruction, Commitment, Signer, AddressLookupTableAccount, VersionedTransaction } from "@solana/web3.js";
 import { PoolAccount } from "./PoolAccount";
@@ -4745,8 +4743,8 @@ export declare class PerpetualsClient {
     getSizeAmountWithSwapSync: (amountIn: BN, leverage: string, side: Side, poolAccount: PoolAccount, inputTokenPrice: OraclePrice, inputTokenEmaPrice: OraclePrice, inputTokenCustodyAccount: CustodyAccount, collateralTokenPrice: OraclePrice, collateralTokenEmaPrice: OraclePrice, collateralTokenCustodyAccount: CustodyAccount, swapOutTokenPrice: OraclePrice, swapOutTokenEmaPrice: OraclePrice, swapOutTokenCustodyAccount: CustodyAccount, targetTokenPrice: OraclePrice, targetTokenEmaPrice: OraclePrice, targetTokenCustodyAccount: CustodyAccount, swapPoolAumUsdMax: BN, poolConfig: PoolConfig, discountBps?: BN) => BN;
     getCollateralAmountWithFeeFromLeverageAndSize: (sizeAmount: BN, leverage: string, marketToken: Token, collateralToken: Token, side: Side, targetPrice: OraclePrice, targetEmaPrice: OraclePrice, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, discountBps?: BN) => BN;
     getCollateralAmountWithSwapSync: (sizeAmount: BN, leverage: string, side: Side, poolAccount: PoolAccount, inputTokenPrice: OraclePrice, inputTokenEmaPrice: OraclePrice, inputTokenCustodyAccount: CustodyAccount, swapOutTokenPrice: OraclePrice, swapOutTokenEmaPrice: OraclePrice, swapOutTokenCustodyAccount: CustodyAccount, collateralTokenPrice: OraclePrice, collateralTokenEmaPrice: OraclePrice, collateralTokenCustodyAccount: CustodyAccount, targetTokenPrice: OraclePrice, targetTokenEmaPrice: OraclePrice, targetTokenCustodyAccount: CustodyAccount, swapPoolAumUsdMax: BN, poolConfig: PoolConfig) => BN;
-    getDecreaseSizeCollateralAndFeeSync: (positionAccount: PositionAccount, marketCorrelation: boolean, sizeDeltaUsd: BN, keepLevSame: boolean, targetPrice: OraclePrice, targetEmaPrice: OraclePrice, marketConfig: MarketConfig, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN, side: Side, poolConfig: PoolConfig, discountBps?: BN, debugLogs?: boolean) => RemoveCollateralData;
-    getMaxWithdrawableAmountSyncInternal: (positionAccount: PositionAccount, targetPrice: OraclePrice, targetEmaPrice: OraclePrice, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN, poolConfig: PoolConfig, closeAmountUsd?: BN, errorBandwidthPercentageUi?: number) => {
+    getDecreaseSizeCollateralAndFeeSync: (positionAccount: PositionAccount, marketCorrelation: boolean, maxPayOffBps: BN, sizeDeltaUsd: BN, keepLevSame: boolean, targetPrice: OraclePrice, targetEmaPrice: OraclePrice, marketConfig: MarketConfig, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN, side: Side, poolConfig: PoolConfig, discountBps?: BN, debugLogs?: boolean) => RemoveCollateralData;
+    getMaxWithdrawableAmountSyncInternal: (positionAccount: PositionAccount, targetPrice: OraclePrice, targetEmaPrice: OraclePrice, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN, poolConfig: PoolConfig, errorBandwidthPercentageUi?: number) => {
         maxWithdrawableAmount: BN;
         maxWithdrawableAmountUsd: BN;
         diffUsd: BN;
@@ -4762,12 +4760,12 @@ export declare class PerpetualsClient {
     getCumulativeLockFeeSync: (custodyAccount: CustodyAccount, currentTimestamp: BN) => BN;
     getBorrowRateSync: (custodyAccount: CustodyAccount, currentUtilization: BN) => BN;
     getLockFeeAndUnsettledUsdForPosition: (position: PositionAccount, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN) => BN;
-    getLockedUsd: (sideUsd: BN, side: Side, marketCorrelation: boolean, maxPayOffBps: BN) => BN;
+    getLockedUsd: (sizeUsd: BN, collateralUsd: BN, side: Side, marketCorrelation: boolean, maxPayOffBps: BN) => BN;
     getLiquidationPriceContractHelper: (entryOraclePrice: OraclePrice, lockAndUnsettledFeeUsd: BN, side: Side, targetCustodyAccount: CustodyAccount, positionAccount: PositionAccount) => OraclePrice;
     getLiquidationPriceSync: (collateralUsd: BN, sizeAmount: BN, entryOraclePrice: OraclePrice, lockAndUnsettledFeeUsd: BN, side: Side, targetPrice: OraclePrice, targetCustodyAccount: CustodyAccount, positionAccount: PositionAccount) => OraclePrice;
     getLiquidationPriceWithOrder: (collateralUsd: BN, sizeAmount: BN, sizeUsd: BN, sizeDecimals: number, limitOraclePrice: OraclePrice, side: Side, targetCustodyAccount: CustodyAccount) => OraclePrice;
-    getMaxProfitPriceSync: (entryPrice: OraclePrice, marketCorrelation: boolean, side: Side, positionAccount: PositionAccount) => OraclePrice;
-    getEstimateProfitLossforTpSlEntry: (positionAccount: PositionAccount | null, isTakeProfit: boolean, userEntrytpSlOraclePrice: OraclePrice, collateralDeltaAmount: BN, sizeDeltaAmount: BN, side: Side, marketAccountPk: PublicKey, targetTokenPrice: OraclePrice, targetTokenEmaPrice: OraclePrice, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, poolConfig: PoolConfig) => {
+    getMaxProfitPriceSync: (entryPrice: OraclePrice, marketCorrelation: boolean, side: Side, collateralPrice: OraclePrice, positionAccount: PositionAccount) => OraclePrice;
+    getEstimateProfitLossforTpSlEntry: (positionAccount: PositionAccount | null, isTakeProfit: boolean, userEntrytpSlOraclePrice: OraclePrice, collateralDeltaAmount: BN, sizeDeltaAmount: BN, side: Side, marketCorrelation: boolean, maxPayOffBps: BN, marketAccountPk: PublicKey, targetTokenPrice: OraclePrice, targetTokenEmaPrice: OraclePrice, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, poolConfig: PoolConfig) => {
         pnlUsd: BN;
         pnlPercentage: BN;
     };
@@ -4956,7 +4954,7 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
-    settleRebates: (owner: PublicKey, rebateSymbol: string, rewardSymbol: string, poolConfig: PoolConfig, createUserATA?: boolean) => Promise<{
+    settleRebates: (rebateSymbol: string, rewardSymbol: string, poolConfig: PoolConfig) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
@@ -5085,6 +5083,10 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    initRebateVault: (allowRebatePayout: boolean, rebateSymbol: string, poolConfig: PoolConfig) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
     distributeTokenReward: (amount: BN, epochCount: number, rewardSymbol: string, poolConfig: PoolConfig) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];

package/dist/PerpetualsClient.js

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -961,7 +961,7 @@ var PerpetualsClient = (function () {
             }
             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)) {
@@ -984,7 +984,6 @@ var PerpetualsClient = (function () {
             var closeRatio = (positionDelta.sizeAmount.mul(decimalPower)).div(positionAccount.sizeAmount);
             positionDelta.sizeUsd = (positionAccount.sizeUsd.mul(closeRatio)).div(decimalPower);
             positionDelta.lockedAmount = (positionAccount.lockedAmount.mul(closeRatio)).div(decimalPower);
-            positionDelta.lockedUsd = (positionAccount.lockedUsd.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);
@@ -1012,14 +1011,21 @@ var PerpetualsClient = (function () {
                 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 {
+                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.collateralUsd = positionAccount.collateralUsd.sub(positionDelta.collateralUsd);
             newPosition.unsettledFeesUsd = positionAccount.unsettledFeesUsd.sub(positionDelta.unsettledFeesUsd);
             newPosition.degenSizeUsd = positionAccount.degenSizeUsd.sub(positionDelta.degenSizeUsd);
+            newPosition.collateralUsd = newPosition.collateralUsd.add(closeAmountUsd);
             var feeUsdWithDiscount = constants_1.BN_ZERO;
             var feeUsd = sizeDeltaUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             if (discountBps.gt(constants_1.BN_ZERO)) {
@@ -1033,24 +1039,25 @@ var PerpetualsClient = (function () {
             feeUsdWithDiscount = feeUsdWithDiscount.add(lockAndUnsettledFeeUsd);
             if (keepLevSame) {
                 var collateralAmountReceived = closeAmount;
-                var collateralAmountRecievedUsd = closeAmountUsd;
-                var _a = _this.getMaxWithdrawableAmountSyncInternal(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmountUsd), maxWithdrawableAmount = _a.maxWithdrawableAmount, diffUsd = _a.diffUsd;
+                var collateralAmountReceivedUsd = closeAmountUsd;
+                var _a = _this.getMaxWithdrawableAmountSyncInternal(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig), maxWithdrawableAmount = _a.maxWithdrawableAmount, maxWithdrawableAmountUsd = _a.maxWithdrawableAmountUsd, diffUsd = _a.diffUsd;
                 if (debugLogs) {
                     console.log("maxWithdrawableAmount ", maxWithdrawableAmount.toString(), keepLevSame);
                     console.log("collateralAmountReceived ", collateralAmountReceived.toString(), keepLevSame);
                 }
-                if (collateralAmountReceived.lt(constants_1.BN_ZERO)) {
+                if (collateralAmountReceivedUsd.lt(constants_1.BN_ZERO)) {
                     collateralAmountReceived = constants_1.BN_ZERO;
-                    collateralAmountRecievedUsd = constants_1.BN_ZERO;
+                    collateralAmountReceivedUsd = constants_1.BN_ZERO;
                 }
-                else if (collateralAmountReceived.gt(maxWithdrawableAmount)) {
+                else if (collateralAmountReceivedUsd.gt(maxWithdrawableAmountUsd)) {
                     if (debugLogs) {
                         console.log("exceeding to redicing maxWithdrawableAmount ", maxWithdrawableAmount.toString(), collateralAmountReceived.toString());
                     }
                     collateralAmountReceived = maxWithdrawableAmount;
-                    collateralAmountRecievedUsd = collateralMinMaxPrice.min.getAssetAmountUsd(maxWithdrawableAmount, collateralCustodyAccount.decimals);
+                    collateralAmountReceivedUsd = maxWithdrawableAmountUsd;
                 }
                 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 });
+                newPosition.collateralUsd = newPosition.collateralUsd.sub(collateralAmountReceivedUsd);
                 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);
@@ -1063,8 +1070,8 @@ var PerpetualsClient = (function () {
                     lockAndUnsettledFeeUsd: lockAndUnsettledFeeUsd,
                     newLev: newLev,
                     liquidationPrice: finalLiquidationPrice,
-                    collateralAmountRecieved: collateralAmountReceived,
-                    collateralAmountRecievedUsd: collateralAmountRecievedUsd,
+                    collateralAmountReceived: collateralAmountReceived,
+                    collateralAmountReceivedUsd: collateralAmountReceivedUsd,
                     newCollateralUsd: newPosition.collateralUsd.add(diffUsd),
                     newPnl: finalPnlUsd
                 };
@@ -1073,8 +1080,7 @@ var PerpetualsClient = (function () {
                 throw "only same leverage is supported for now";
             }
         };
-        this.getMaxWithdrawableAmountSyncInternal = function (positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmountUsd, errorBandwidthPercentageUi) {
-            if (closeAmountUsd === void 0) { closeAmountUsd = constants_1.BN_ZERO; }
+        this.getMaxWithdrawableAmountSyncInternal = function (positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, errorBandwidthPercentageUi) {
             if (errorBandwidthPercentageUi === void 0) { errorBandwidthPercentageUi = 5; }
             if (errorBandwidthPercentageUi > 100 || errorBandwidthPercentageUi < 0) {
                 throw new Error("errorBandwidthPercentageUi cannot be >100 or <0");
@@ -1087,10 +1093,9 @@ var PerpetualsClient = (function () {
             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 = positionAccount.collateralUsd.sub(closeAmountUsd);
             var availableInitMarginUsd = constants_1.BN_ZERO;
-            if (profitLoss.lossUsd.lt(currentCollateralUsd)) {
-                availableInitMarginUsd = currentCollateralUsd.sub(lossUsd);
+            if (profitLoss.lossUsd.lt(positionAccount.collateralUsd)) {
+                availableInitMarginUsd = positionAccount.collateralUsd.sub(lossUsd);
             }
             else {
                 console.log("profitLoss.lossUsd > coll :: should have been liquidated");
@@ -1220,12 +1225,12 @@ var PerpetualsClient = (function () {
             var cumulativeLockFee = _this.getCumulativeLockFeeSync(collateralCustodyAccount, currentTimestamp);
             var lockFeeUsd = constants_1.BN_ZERO;
             if (cumulativeLockFee.gt(position.cumulativeLockFeeSnapshot)) {
-                lockFeeUsd = cumulativeLockFee.sub(position.cumulativeLockFeeSnapshot).mul(position.lockedUsd).div(new anchor_1.BN(constants_1.RATE_POWER));
+                lockFeeUsd = cumulativeLockFee.sub(position.cumulativeLockFeeSnapshot).mul(position.sizeUsd).div(new anchor_1.BN(constants_1.RATE_POWER));
             }
             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);
@@ -1233,7 +1238,7 @@ 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.getLiquidationPriceContractHelper = function (entryOraclePrice, lockAndUnsettledFeeUsd, side, targetCustodyAccount, positionAccount) {
@@ -1372,7 +1377,7 @@ var PerpetualsClient = (function () {
             }
             return liquidationPrice.price.isNeg() ? zeroOraclePrice : liquidationPrice;
         };
-        this.getMaxProfitPriceSync = function (entryPrice, marketCorrelation, side, positionAccount) {
+        this.getMaxProfitPriceSync = function (entryPrice, marketCorrelation, side, collateralPrice, positionAccount) {
             var zeroOraclePrice = OraclePrice_1.OraclePrice.from({
                 price: constants_1.BN_ZERO,
                 exponent: constants_1.BN_ZERO,
@@ -1383,7 +1388,7 @@ var PerpetualsClient = (function () {
                 return zeroOraclePrice;
             }
             var priceDiffProfit = OraclePrice_1.OraclePrice.from({
-                price: positionAccount.lockedUsd.mul(new anchor_1.BN(10).pow(new anchor_1.BN(positionAccount.sizeDecimals + 3)))
+                price: (collateralPrice.price.mul(positionAccount.lockedAmount)).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,
@@ -1411,7 +1416,7 @@ var PerpetualsClient = (function () {
             }
             return maxProfitPrice.price.isNeg() ? zeroOraclePrice : maxProfitPrice;
         };
-        this.getEstimateProfitLossforTpSlEntry = function (positionAccount, isTakeProfit, userEntrytpSlOraclePrice, collateralDeltaAmount, sizeDeltaAmount, side, marketAccountPk, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, poolConfig) {
+        this.getEstimateProfitLossforTpSlEntry = function (positionAccount, isTakeProfit, userEntrytpSlOraclePrice, collateralDeltaAmount, sizeDeltaAmount, side, marketCorrelation, maxPayOffBps, marketAccountPk, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, poolConfig) {
             if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
                 throw new Error("Delta Amounts cannot be negative.");
             }
@@ -1441,10 +1446,9 @@ var PerpetualsClient = (function () {
             positionAccount.sizeUsd = positionAccount.sizeUsd.add(sizeDeltaUsd);
             positionAccount.sizeAmount = positionAccount.sizeAmount.add(sizeDeltaAmount);
             positionAccount.market = marketAccountPk;
-            positionAccount.lockedUsd = targetTokenPrice.getAssetAmountUsd(positionAccount.sizeAmount, targetCustodyAccount.decimals);
-            positionAccount.lockedAmount = collateralPrice.getTokenAmount(positionAccount.lockedUsd, collateralCustodyAccount.decimals);
             var collateralDeltaUsd = collateralPrice.getAssetAmountUsd(collateralDeltaAmount, collateralCustodyAccount.decimals);
             positionAccount.collateralUsd = positionAccount.collateralUsd.add(collateralDeltaUsd);
+            positionAccount.lockedAmount = positionAccount.lockedAmount.add(collateralPrice.getTokenAmount(_this.getLockedUsd(sizeDeltaUsd, collateralDeltaUsd, side, marketCorrelation, maxPayOffBps), collateralCustodyAccount.decimals));
             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);
@@ -5449,72 +5453,53 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.settleRebates = function (owner_1, rebateSymbol_1, rewardSymbol_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 4; _i < arguments.length; _i++) {
-                args_1[_i - 4] = arguments[_i];
-            }
-            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;
-                            preInstructions = [];
-                            instructions = [];
-                            postInstructions = [];
-                            additionalSigners = [];
-                            _b.label = 1;
-                        case 1:
-                            _b.trys.push([1, 5, , 6]);
-                            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)(userTokenAccount, this.provider.connection)];
-                        case 2:
-                            _a = !(_b.sent());
-                            _b.label = 3;
-                        case 3:
-                            if (_a) {
-                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userTokenAccount, publicKey, rebateMint));
-                            }
-                            return [4, this.program.methods
-                                    .settleRebates()
-                                    .accounts({
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: this.perpetuals.publicKey,
-                                    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,
-                                    program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                                })
-                                    .instruction()];
-                        case 4:
-                            settleRebatesInstruction = _b.sent();
-                            instructions.push(settleRebatesInstruction);
-                            return [3, 6];
-                        case 5:
-                            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
-                            }];
-                    }
-                });
+        this.settleRebates = function (rebateSymbol, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, rebateMint, settleRebatesInstruction, err_29;
+            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]);
+                        rewardCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
+                        rebateMint = poolConfig.getTokenFromSymbol(rebateSymbol).mintKey;
+                        return [4, this.program.methods
+                                .settleRebates()
+                                .accounts({
+                                transferAuthority: poolConfig.transferAuthority,
+                                perpetuals: this.perpetuals.publicKey,
+                                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,
+                                program: this.programId,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        settleRebatesInstruction = _a.sent();
+                        instructions.push(settleRebatesInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_29 = _a.sent();
+                        console.log("perpClient settleRebatesInstruction error:: ", err_29);
+                        throw err_29;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
             });
-        };
+        }); };
         this.placeLimitOrder = function (targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, limitPrice_1, reserveAmount_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1) {
             var args_1 = [];
             for (var _i = 11; _i < arguments.length; _i++) {
@@ -7686,8 +7671,54 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
+        this.initRebateVault = function (allowRebatePayout, rebateSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateCustodyMint, initRebateVaultInstruction, err_60;
+            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]);
+                        rebateCustodyMint = poolConfig.getTokenFromSymbol(rebateSymbol).mintKey;
+                        return [4, this.program.methods
+                                .initRebateVault({
+                                allowRebatePayout: allowRebatePayout
+                            })
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: poolConfig.transferAuthority,
+                                perpetuals: this.perpetuals.publicKey,
+                                rebateMint: rebateCustodyMint,
+                                rebateTokenAccount: poolConfig.rebateTokenAccount,
+                                rebateVault: poolConfig.rebateVault,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        initRebateVaultInstruction = _a.sent();
+                        instructions.push(initRebateVaultInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_60 = _a.sent();
+                        console.log("perpClient initRebateVaultInstruction error:: ", err_60);
+                        throw err_60;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
         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_60;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_61;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7726,9 +7757,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_60 = _a.sent();
-                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_60);
-                        throw err_60;
+                        err_61 = _a.sent();
+                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_61);
+                        throw err_61;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7737,7 +7768,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_61;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_62;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7765,9 +7796,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenStakeLevelInstruction);
                         return [3, 4];
                     case 3:
-                        err_61 = _a.sent();
-                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_61);
-                        throw err_61;
+                        err_62 = _a.sent();
+                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_62);
+                        throw err_62;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7776,7 +7807,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_62;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_63;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7808,9 +7839,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_62 = _a.sent();
-                        console.log("perpClient setTokenRewardInstruction error:: ", err_62);
-                        throw err_62;
+                        err_63 = _a.sent();
+                        console.log("perpClient setTokenRewardInstruction error:: ", err_63);
+                        throw err_63;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7819,7 +7850,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.resizeInternalOracle = function (extOracle, tokenMint, intOracleAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, resizeInternalOracleInstruction, err_63;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, resizeInternalOracleInstruction, err_64;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7848,9 +7879,9 @@ var PerpetualsClient = (function () {
                         instructions.push(resizeInternalOracleInstruction);
                         return [3, 4];
                     case 3:
-                        err_63 = _a.sent();
-                        console.log("perpClient resizeInternalOracleInstruction error:: ", err_63);
-                        throw err_63;
+                        err_64 = _a.sent();
+                        console.log("perpClient resizeInternalOracleInstruction error:: ", err_64);
+                        throw err_64;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners

package/dist/PoolAccount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { Pool, TokenRatios, StakeStats, CompoundingStats, Permissions } from "./types";
 import { PublicKey } from "@solana/web3.js";

package/dist/PoolConfig.json

@@ -23,7 +23,7 @@
             "stakedLpTokenSymbol": "sFLP.1",
             "perpetuals": "81XigYeVi4vCZhKq6trfbYPqj6SEmP7xH46GTwxGxhmz",
             "transferAuthority": "49hcrkDRS4chZw6G7CJLAAaZxttz4Cz7jCouFdvg5JDy",
-            "tokenMint": "FAFxVxnkzZHMCodkWyoccgUNgVScqMw2mhhQBYDFjFAF",
+            "tokenMint": "fafsR7zoBPiSBAa96fUQiCJExsoXV5u6HaWrdXL19B2",
             "tokenVault": "6Knz2PVpKdT4wzgZsNMZwvPR3sh8ik93wfXbu6fSgoKy",
             "tokenVaultTokenAccount": "7iNSKn6fnZHJFD9xnvGYRYdKrNXrGp6aLHJz15yjcM6E",
             "rebateVault": "H19XuZAiYwpZfi3nhFsbUwyTWnfZqB7qWjs1Mi9JVWLE",
@@ -127,10 +127,10 @@
                     "symbol": "ZEC",
                     "mintKey": "zecrXUjqA7bZdozZkqbh3wgrVGdwCd4jHRBg8Gd8Vrf",
                     "decimals": 8,
-                    "usdPrecision": 2,
+                    "usdPrecision": 4,
                     "tokenPrecision": 4,
                     "isStable": false,
-                    "isVirtual": false,
+                    "isVirtual": true,
                     "lazerId": 66,
                     "pythTicker": "Crypto.ZEC/USD",
                     "pythPriceId": "0xbe9b59d178f0d6a97ab4c343bff2aa69caa1eaae3e9048a65788c529b125bb24",
@@ -224,17 +224,17 @@
                     "pythPriceId": "0x67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb"
                 },
                 {
-                    "custodyId": 5,
-                    "custodyAccount": "69i9vSMGgm9ih6jLpzg2YZXpt6xRtiKYaxVGZLyNBxRT",
-                    "tokenAccount": "GGTvh4u8UDmrKaMjVRZtpVECw4hDbdocBbQ11b88uWbV",
+                    "custodyId": 6,
+                    "custodyAccount": "9UGk7k6x9qBiegCNKtCvvVnc3PcAv3VxnEnuFLHbXkzE",
+                    "tokenAccount": "2Gfmf3YSGmhu34qmeaTTrULGN4UD9dbcubSyNw9ef56s",
                     "symbol": "ZEC",
                     "mintKey": "zecrXUjqA7bZdozZkqbh3wgrVGdwCd4jHRBg8Gd8Vrf",
                     "decimals": 8,
-                    "usdPrecision": 2,
+                    "usdPrecision": 4,
                     "tokenPrecision": 4,
                     "isStable": false,
-                    "isVirtual": false,
-                    "intOracleAddress": "CKGi7WnzD5zBNZAA6ZQxCecg3GaWqV1aoEQvoLr9T8C4",
+                    "isVirtual": true,
+                    "intOracleAddress": "78s4o5YXUA73gDG557MNNeJyoQoUxms8SdTBbVZ6j2Q2",
                     "extOracleAddress": "HzdKMXqocYWqy7mh8AKDoZFJinjeGMfBKmGAxGbasc28",
                     "lazerId": 66,
                     "pythTicker": "Crypto.ZEC/USD",
@@ -356,32 +356,32 @@
                 },
                 {
                     "marketId": 7,
-                    "marketAccount": "DDcZvQpfTnqjz2mNYhcHvLMwn6PhgrN2bpBDD9W2dj3v",
-                    "marketCorrelation": true,
-                    "pool": "4SR2FJETBR4Q5uhsiT6a5ALF51jQwy4AjDQgGyvacGLi",
-                    "targetCustody": "69i9vSMGgm9ih6jLpzg2YZXpt6xRtiKYaxVGZLyNBxRT",
-                    "collateralCustody": "69i9vSMGgm9ih6jLpzg2YZXpt6xRtiKYaxVGZLyNBxRT",
+                    "marketAccount": "5awifMKx3S2EHpPSA2yLiNE8VgR8kweNbNJsL43xE1Uy",
+                    "marketCorrelation": false,
+                    "pool": "9VN3TRG2GW1ugaPwkVzBC1tGQ1vatUvXTQ8dWrxNbCWA",
+                    "targetCustody": "9UGk7k6x9qBiegCNKtCvvVnc3PcAv3VxnEnuFLHbXkzE",
+                    "collateralCustody": "9BJ1J3GwvswPNMNsSoxkLrhePW4zUDaKRSuaoJGjRFe5",
                     "side": "long",
-                    "maxLev": 50,
-                    "degenMinLev": 50,
-                    "degenMaxLev": 50,
-                    "targetCustodyId": 5,
-                    "collateralCustodyId": 5,
+                    "maxLev": 100,
+                    "degenMinLev": 125,
+                    "degenMaxLev": 500,
+                    "targetCustodyId": 6,
+                    "collateralCustodyId": 0,
                     "targetMint": "zecrXUjqA7bZdozZkqbh3wgrVGdwCd4jHRBg8Gd8Vrf",
-                    "collateralMint": "zecrXUjqA7bZdozZkqbh3wgrVGdwCd4jHRBg8Gd8Vrf"
+                    "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
                 },
                 {
                     "marketId": 8,
-                    "marketAccount": "4zz1aPZG2gFN9rKmuzRmuypeZWTeS3z81KNjrLF6E5qV",
+                    "marketAccount": "4kceR5EhDVNJAdKMxdyCiPxeny7XRmVthMJzr3gQiizN",
                     "marketCorrelation": false,
-                    "pool": "4SR2FJETBR4Q5uhsiT6a5ALF51jQwy4AjDQgGyvacGLi",
-                    "targetCustody": "69i9vSMGgm9ih6jLpzg2YZXpt6xRtiKYaxVGZLyNBxRT",
-                    "collateralCustody": "BwroR4MpPBFWLocL5CM4kLDAjx1aH3ogma1zYJfbHS1E",
+                    "pool": "9VN3TRG2GW1ugaPwkVzBC1tGQ1vatUvXTQ8dWrxNbCWA",
+                    "targetCustody": "9UGk7k6x9qBiegCNKtCvvVnc3PcAv3VxnEnuFLHbXkzE",
+                    "collateralCustody": "9BJ1J3GwvswPNMNsSoxkLrhePW4zUDaKRSuaoJGjRFe5",
                     "side": "short",
-                    "maxLev": 50,
-                    "degenMinLev": 50,
-                    "degenMaxLev": 50,
-                    "targetCustodyId": 5,
+                    "maxLev": 100,
+                    "degenMinLev": 125,
+                    "degenMaxLev": 500,
+                    "targetCustodyId": 6,
                     "collateralCustodyId": 0,
                     "targetMint": "zecrXUjqA7bZdozZkqbh3wgrVGdwCd4jHRBg8Gd8Vrf",
                     "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"

package/dist/PoolDataClient.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { Mint } from "@solana/spl-token";
 import { CustodyAccount } from "./CustodyAccount";

package/dist/PositionAccount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { ContractOraclePrice, Position } from "./types";