flash-sdk 1.0.134 → 2.0.0

package/dist/PerpetualsClient.js

@@ -74,6 +74,7 @@ var rpc_1 = require("./utils/rpc");
 var utils_1 = require("./utils");
 var constants_1 = require("./constants");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
+var getNftAccounts_1 = require("./utils/getNftAccounts");
 var PerpetualsClient = (function () {
     function PerpetualsClient(provider, programId, composabilityProgramId, opts) {
         var _this = this;
@@ -249,34 +250,28 @@ var PerpetualsClient = (function () {
                 return [2, this.program.account.multisig.fetch(this.multisig.publicKey)];
             });
         }); };
-        this.getPositionKey = function (wallet, poolName, tokenMint, side) {
-            var pool = _this.getPoolKey(poolName);
-            var custody = _this.getCustodyKey(poolName, tokenMint);
-            return _this.findProgramAddress("position", [
-                wallet,
-                pool,
-                custody,
-                side === "long" ? [1] : [2],
-            ]).publicKey;
-        };
         this.getPosition = function (postionKey) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 return [2, this.program.account.position.fetch(postionKey)];
             });
         }); };
-        this.getUserPosition = function (wallet, poolName, tokenMint, side) { return __awaiter(_this, void 0, void 0, function () {
+        this.getUserPosition = function (owner, targetCustody, collateralCustody, side) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2, this.program.account.position.fetch(this.getPositionKey(wallet, poolName, tokenMint, side))];
+                return [2, this.program.account.position.fetch(this.getPositionKey(owner, targetCustody, collateralCustody, side))];
             });
         }); };
         this.getUserPositions = function (wallet, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var positionKeys, positionsDatas;
+            var marketAccountsPks, positionKeys, positionsDatas;
             var _this = this;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        positionKeys = __spreadArray(__spreadArray([], poolConfig.getNonStableTokens().map(function (mint) { return _this.getPositionKey(wallet, poolConfig.poolName, mint, 'long'); }), true), poolConfig.getNonStableTokens().map(function (mint) { return _this.getPositionKey(wallet, poolConfig.poolName, mint, 'short'); }), true);
+                        marketAccountsPks = poolConfig.getAllMarketPks();
+                        positionKeys = marketAccountsPks.map(function (f) { return _this.findProgramAddress("position", [
+                            wallet,
+                            f
+                        ]); }).map(function (p) { return p.publicKey; });
                         return [4, this.provider.connection.getMultipleAccountsInfo(positionKeys)];
                     case 1:
                         positionsDatas = (_a = (_b.sent())) !== null && _a !== void 0 ? _a : [];
@@ -405,11 +400,18 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addPool = function (name) { 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
-                            .addPool({ name: name })
+                            .addPool({
+                            name: name,
+                            maxAumUsd: maxAumUsd,
+                            permissions: permissions,
+                            metadataSymbol: metadataSymbol,
+                            metadataTitle: metadataTitle,
+                            metadataUri: metadataUri
+                        })
                             .accounts({
                             admin: this.provider.wallet.publicKey,
                             multisig: this.multisig.publicKey,
@@ -456,7 +458,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCustody = function (poolName, tokenMint, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios) { return __awaiter(_this, void 0, void 0, function () {
+        this.addCustody = function (poolName, tokenMint, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment) { return __awaiter(_this, void 0, void 0, function () {
             var trx_id, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -472,6 +474,7 @@ var PerpetualsClient = (function () {
                                 fees: fees,
                                 borrowRate: borrowRate,
                                 ratios: ratios,
+                                depegAdjustment: depegAdjustment
                             })
                                 .accounts({
                                 admin: this.admin,
@@ -570,28 +573,28 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.getLiquidationState = function (wallet, poolName, tokenMint, collateralMint, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, _b;
+            var targetCustody, collateralCustody, _a, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
+                        targetCustody = this.getCustodyKey(poolConfig.poolName, tokenMint);
+                        collateralCustody = this.getCustodyKey(poolConfig.poolName, tokenMint);
                         _b = (_a = this.program.methods
                             .getLiquidationState({}))
                             .accounts;
                         _c = {
                             perpetuals: this.perpetuals.publicKey,
                             pool: this.getPoolKey(poolName),
-                            position: this.getPositionKey(wallet, poolName, tokenMint, side),
-                            custody: this.getCustodyKey(poolName, tokenMint)
+                            position: this.getPositionKey(wallet, targetCustody, collateralCustody, side),
+                            targetCustody: this.getCustodyKey(poolName, tokenMint)
                         };
                         return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
                     case 1:
-                        _c.custodyOracleAccount = _d.sent(),
-                            _c.custodyCustomOracleAccount = poolConfig.backupOracle,
-                            _c.collateralCustody = this.getCustodyKey(poolName, collateralMint),
-                            _c.collateralCustodyCustomOracleAccount = poolConfig.backupOracle;
+                        _c.targetOracleAccount = _d.sent(),
+                            _c.collateralCustody = this.getCustodyKey(poolName, collateralMint);
                         return [4, this.getCustodyOracleAccountKey(poolName, collateralMint)];
-                    case 2: return [4, _b.apply(_a, [(_c.collateralCustodyOracleAccount = _d.sent(),
+                    case 2: return [4, _b.apply(_a, [(_c.collateralOracleAccount = _d.sent(),
                                 _c.ixSysvar = web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 _c)])
                             .view()
@@ -603,69 +606,34 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.validateCollectivePnl = function (marketSymbol, collateralSymbol, poolConfig, poolName, side) { return __awaiter(_this, void 0, void 0, function () {
-            var marketCustodyConfig, collateralCustodyConfig;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
-                        collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                        return [4, this.program.methods
-                                .validateCollectivePnl({ side: side })
-                                .accounts({
-                                perpetuals: this.perpetuals.publicKey,
-                                pool: this.getPoolKey(poolName),
-                                custody: marketCustodyConfig.custodyAccount,
-                                custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: poolConfig.backupOracle,
-                                collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                            })
-                                .remainingAccounts([])
-                                .rpc()
-                                .catch(function (err) {
-                                console.error(err);
-                                throw err;
-                            })];
-                    case 1:
-                        _a.sent();
-                        return [2];
-                }
-            });
-        }); };
-        this.liquidate = function (wallet, poolConfig, tokenMint, collateralMint, side, receivingAccount, rewardsReceivingAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var poolName, _a, _b;
+        this.liquidate = function (wallet, poolConfig, tokenMint, collateralMint, side) { return __awaiter(_this, void 0, void 0, function () {
+            var poolName, market, targetCustody, collateralCustody, _a, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         poolName = poolConfig.poolName;
+                        market = poolConfig.getMarketPk(this.getCustodyKey(poolName, tokenMint), this.getCustodyKey(poolName, collateralMint), side === 'long' ? types_1.Side.Long : types_1.Side.Short);
+                        targetCustody = this.getCustodyKey(poolConfig.poolName, tokenMint);
+                        collateralCustody = this.getCustodyKey(poolConfig.poolName, tokenMint);
                         _b = (_a = this.program.methods
                             .liquidate({}))
                             .accounts;
                         _c = {
                             signer: this.provider.wallet.publicKey,
-                            receivingAccount: receivingAccount,
-                            rewardsReceivingAccount: rewardsReceivingAccount,
-                            transferAuthority: this.authority.publicKey,
                             perpetuals: this.perpetuals.publicKey,
                             pool: this.getPoolKey(poolName),
-                            position: this.getPositionKey(wallet, poolName, tokenMint, side),
-                            custody: this.getCustodyKey(poolName, tokenMint)
+                            position: this.getPositionKey(wallet, targetCustody, collateralCustody, side),
+                            market: market,
+                            targetCustody: this.getCustodyKey(poolName, tokenMint)
                         };
                         return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
                     case 1:
-                        _c.custodyOracleAccount = _d.sent(),
+                        _c.targetOracleAccount = _d.sent(),
                             _c.collateralCustody = this.getCustodyKey(poolName, collateralMint);
                         return [4, this.getCustodyOracleAccountKey(poolName, collateralMint)];
-                    case 2: return [4, _b.apply(_a, [(_c.collateralCustodyOracleAccount = _d.sent(),
-                                _c.collateralCustodyTokenAccount = this.getCustodyTokenAccountKey(poolName, collateralMint),
-                                _c.collateralCustodyCustomOracleAccount = poolConfig.backupOracle,
-                                _c.custodyCustomOracleAccount = poolConfig.backupOracle,
+                    case 2: return [4, _b.apply(_a, [(_c.collateralOracleAccount = _d.sent(),
                                 _c.eventAuthority = this.eventAuthority.publicKey,
-                                _c.tokenProgram = spl_token_1.TOKEN_PROGRAM_ID,
                                 _c.program = this.program.programId,
                                 _c.ixSysvar = web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 _c)])
@@ -775,12 +743,15 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.getEntryPriceAndFeeView = function (poolName, tokenMint, collateral, size, side) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, _b;
+        this.getEntryPriceAndFeeView = function (tokenMint, collateralMint, collateral, size, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var targetCustody, collateralCustody, market, _a, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
+                        targetCustody = this.getCustodyKey(poolConfig.poolName, tokenMint);
+                        collateralCustody = this.getCustodyKey(poolConfig.poolName, collateralMint);
+                        market = poolConfig.getMarketPk(targetCustody, collateralCustody, side === 'long' ? types_1.Side.Long : types_1.Side.Short);
                         _b = (_a = this.program.methods
                             .getEntryPriceAndFee({
                             collateral: collateral,
@@ -790,11 +761,16 @@ var PerpetualsClient = (function () {
                             .accounts;
                         _c = {
                             perpetuals: this.perpetuals.publicKey,
-                            pool: this.getPoolKey(poolName),
-                            custody: this.getCustodyKey(poolName, tokenMint)
+                            pool: poolConfig.poolAddress,
+                            targetCustody: targetCustody
                         };
-                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolConfig.poolName, tokenMint)];
+                    case 1:
+                        _c.targetOracleAccount = _d.sent(),
+                            _c.collateralCustody = collateralCustody;
+                        return [4, this.getCustodyOracleAccountKey(poolConfig.poolName, collateralMint)];
+                    case 2: return [4, _b.apply(_a, [(_c.collateralOracleAccount = _d.sent(),
+                                _c.market = market,
                                 _c.ixSysvar = web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 _c)])
                             .view()
@@ -802,27 +778,35 @@ var PerpetualsClient = (function () {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2, _d.sent()];
+                    case 3: return [2, _d.sent()];
                 }
             });
         }); };
-        this.getExitPriceAndFeeView = function (wallet, poolName, tokenMint, side) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, _b;
+        this.getExitPriceAndFeeView = function (wallet, tokenMint, collateralMint, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var targetCustody, collateralCustody, market, _a, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
+                        targetCustody = this.getCustodyKey(poolConfig.poolName, tokenMint);
+                        collateralCustody = this.getCustodyKey(poolConfig.poolName, collateralMint);
+                        market = poolConfig.getMarketPk(targetCustody, collateralCustody, side === 'long' ? types_1.Side.Long : types_1.Side.Short);
                         _b = (_a = this.program.methods
                             .getExitPriceAndFee({}))
                             .accounts;
                         _c = {
                             perpetuals: this.perpetuals.publicKey,
-                            pool: this.getPoolKey(poolName),
-                            position: this.getPositionKey(wallet, poolName, tokenMint, side),
-                            custody: this.getCustodyKey(poolName, tokenMint)
+                            pool: poolConfig.poolAddress,
+                            position: this.getPositionKey(wallet, targetCustody, collateralCustody, side),
+                            targetCustody: this.getCustodyKey(poolConfig.poolName, tokenMint)
                         };
-                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolConfig.poolName, tokenMint)];
+                    case 1:
+                        _c.targetOracleAccount = _d.sent(),
+                            _c.collateralCustody = this.getCustodyKey(poolConfig.poolName, collateralMint);
+                        return [4, this.getCustodyOracleAccountKey(poolConfig.poolName, collateralMint)];
+                    case 2: return [4, _b.apply(_a, [(_c.collateralOracleAccount = _d.sent(),
+                                _c.market = market,
                                 _c.ixSysvar = web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 _c)])
                             .view()
@@ -830,63 +814,35 @@ var PerpetualsClient = (function () {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2, _d.sent()];
+                    case 3: return [2, _d.sent()];
                 }
             });
         }); };
-        this.getLiquidationPriceView = function (wallet, poolName, tokenMint, side, addCollateral, removeCollateral) {
-            if (addCollateral === void 0) { addCollateral = new anchor_1.BN(0); }
-            if (removeCollateral === void 0) { removeCollateral = new anchor_1.BN(0); }
-            return __awaiter(_this, void 0, void 0, function () {
-                var _a, _b;
-                var _c;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
-                        case 0:
-                            _b = (_a = this.program.methods
-                                .getLiquidationPrice({
-                                addCollateralDelta: addCollateral,
-                                removeCollateralDelta: removeCollateral,
-                            }))
-                                .accounts;
-                            _c = {
-                                perpetuals: this.perpetuals.publicKey,
-                                pool: this.getPoolKey(poolName),
-                                position: this.getPositionKey(wallet, poolName, tokenMint, side),
-                                custody: this.getCustodyKey(poolName, tokenMint)
-                            };
-                            return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                        case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
-                                    _c.ixSysvar = web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    _c)])
-                                .view()
-                                .catch(function (err) {
-                                console.error(err);
-                                throw err;
-                            })];
-                        case 2: return [2, _d.sent()];
-                    }
-                });
-            });
-        };
-        this.getPnlView = function (wallet, poolName, tokenMint, side) { return __awaiter(_this, void 0, void 0, function () {
-            var pos, _a, _b;
+        this.getPnlView = function (wallet, tokenMint, collateralMint, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var targetCustody, collateralCustody, market, pos, _a, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        pos = this.getPositionKey(wallet, poolName, tokenMint, side);
+                        targetCustody = this.getCustodyKey(poolConfig.poolName, tokenMint);
+                        collateralCustody = this.getCustodyKey(poolConfig.poolName, collateralMint);
+                        market = poolConfig.getMarketPk(targetCustody, collateralCustody, side === 'long' ? types_1.Side.Long : types_1.Side.Short);
+                        pos = this.getPositionKey(wallet, targetCustody, collateralCustody, side);
                         _b = (_a = this.program.methods
                             .getPnl({}))
                             .accounts;
                         _c = {
                             perpetuals: this.perpetuals.publicKey,
-                            pool: this.getPoolKey(poolName),
+                            pool: poolConfig.poolAddress,
                             position: pos,
-                            custody: this.getCustodyKey(poolName, tokenMint)
+                            targetCustody: this.getCustodyKey(poolConfig.poolName, tokenMint)
                         };
-                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolConfig.poolName, tokenMint)];
+                    case 1:
+                        _c.custodyOracleAccount = _d.sent(),
+                            _c.collateralCustody = this.getCustodyKey(poolConfig.poolName, tokenMint);
+                        return [4, this.getCustodyOracleAccountKey(poolConfig.poolName, collateralMint)];
+                    case 2: return [4, _b.apply(_a, [(_c.collateralOracleAccount = _d.sent(),
                                 _c.ixSysvar = web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 _c)])
                             .view()
@@ -894,11 +850,11 @@ var PerpetualsClient = (function () {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2, _d.sent()];
+                    case 3: return [2, _d.sent()];
                 }
             });
         }); };
-        this.getSwapAmountAndFeesView = function (poolName, tokenMintIn, tokenMintOut, amountIn) { return __awaiter(_this, void 0, void 0, function () {
+        this.getSwapAmountAndFeesView = function (poolName, tokenMintIn, tokenMintOut, amountIn, useFeePool) { return __awaiter(_this, void 0, void 0, function () {
             var _a, _b;
             var _c;
             return __generator(this, function (_d) {
@@ -907,6 +863,7 @@ var PerpetualsClient = (function () {
                         _b = (_a = this.program.methods
                             .getSwapAmountAndFees({
                             amountIn: amountIn,
+                            useFeePool: useFeePool
                         }))
                             .accounts;
                         _c = {
@@ -1053,47 +1010,64 @@ var PerpetualsClient = (function () {
             return { feeBps: fee, feeAmount: feeAmount };
         };
         this.getMinAndMaxOraclePriceSync = function (price, emaPrice, custodyAccount) {
-            var minPrice = price;
-            var deviation;
+            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) {
-                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 }));
+                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 {
-                deviation = price.getDeviationFactor(emaPrice);
-            }
-            if (deviation.gte(custodyAccount.oracle.maxDeviationThreshold)) {
-                var confFactor = (price.confidence.muln(constants_1.BPS_POWER)).div(price.price);
-                if (confFactor.lt(custodyAccount.oracle.maxPriceError)) {
-                    minPrice.price = price.price.sub(price.confidence);
+                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 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)) {
+                    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: minPriceUsd,
+                        max: maxPriceUsd
+                    };
                 }
                 else {
-                    minPrice.price = price.price.sub(price.confidence);
+                    minPriceUsd.price = maxPriceUsd.price.sub(maxPriceUsd.confidence);
+                    return {
+                        min: minPriceUsd,
+                        max: maxPriceUsd
+                    };
                 }
             }
             else {
                 return {
-                    min: price,
-                    max: price
+                    min: maxPriceUsd,
+                    max: maxPriceUsd
                 };
             }
-            return {
-                min: minPrice,
-                max: price
-            };
         };
         this.getMinAndMaxPriceSync = function (price, emaPrice, custodyAccount) {
             var minPrice = price;
-            var deviation;
+            var divergenceBps;
             if (custodyAccount.isStable) {
-                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 }));
+                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 {
-                deviation = price.getDeviationFactor(emaPrice);
+                divergenceBps = price.getDeviationFactor(emaPrice);
             }
-            if (deviation.gte(custodyAccount.oracle.maxDeviationThreshold)) {
-                var confFactor = (price.confidence.muln(constants_1.BPS_POWER)).div(price.price);
-                if (confFactor.lt(custodyAccount.oracle.maxPriceError)) {
-                    minPrice.price = price.price.sub(price.confidence);
+            if (divergenceBps.gte(custodyAccount.oracle.maxDivergenceBps)) {
+                var factorBps = (divergenceBps.mul(new anchor_1.BN(constants_1.BPS_POWER))).div(custodyAccount.oracle.maxDivergenceBps);
+                var confBps = (price.confidence.muln(constants_1.BPS_POWER)).div(price.price);
+                if (confBps.lt(custodyAccount.oracle.maxConfBps)) {
+                    var confFactor = anchor_1.BN.min(factorBps, new anchor_1.BN(50000));
+                    var confScale = (price.confidence.mul(confFactor)).div(new anchor_1.BN(constants_1.BPS_POWER));
+                    minPrice.price = price.price.sub(confScale);
                 }
                 else {
                     minPrice.price = price.price.sub(price.confidence);
@@ -1101,13 +1075,13 @@ var PerpetualsClient = (function () {
             }
             else {
                 return {
-                    min: price.scale_to_exponent(new anchor_1.BN(constants_1.PRICE_DECIMALS).neg()).price,
-                    max: price.scale_to_exponent(new anchor_1.BN(constants_1.PRICE_DECIMALS).neg()).price
+                    min: price.scale_to_exponent(new anchor_1.BN(constants_1.USD_DECIMALS).neg()).price,
+                    max: price.scale_to_exponent(new anchor_1.BN(constants_1.USD_DECIMALS).neg()).price
                 };
             }
             return {
-                min: minPrice.scale_to_exponent(new anchor_1.BN(constants_1.PRICE_DECIMALS).neg()).price,
-                max: price.scale_to_exponent(new anchor_1.BN(constants_1.PRICE_DECIMALS).neg()).price
+                min: minPrice.scale_to_exponent(new anchor_1.BN(constants_1.USD_DECIMALS).neg()).price,
+                max: price.scale_to_exponent(new anchor_1.BN(constants_1.USD_DECIMALS).neg()).price
             };
         };
         this.checkIfPriceStaleOrCustom = function (price, emaPrice, custodyAccount, timestampInSeconds) {
@@ -1124,9 +1098,9 @@ var PerpetualsClient = (function () {
             else {
                 deviation = price.getDeviationFactor(emaPrice);
             }
-            if (deviation.gte(custodyAccount.oracle.maxDeviationThreshold)) {
+            if (deviation.gte(custodyAccount.oracle.maxDivergenceBps)) {
                 var confFactor = (price.confidence.muln(constants_1.BPS_POWER)).div(price.price);
-                if (confFactor.lt(custodyAccount.oracle.maxPriceError)) {
+                if (confFactor.lt(custodyAccount.oracle.maxConfBps)) {
                     return false;
                 }
                 else {
@@ -1153,7 +1127,7 @@ var PerpetualsClient = (function () {
                 return new anchor_1.BN(Number.MAX_SAFE_INTEGER);
             }
         };
-        this.getLeverageAtAmountEntryWithSwapSync = function (positionAccount, inputDeltaAmount, sizeDeltaAmount, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount, poolAumUsdMax, poolConfig, pnlUsd) {
+        this.getLeverageAtAmountEntryWithSwapSync = function (positionAccount, inputDeltaAmount, sizeDeltaAmount, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, poolAumUsdMax, poolConfig, pnlUsd) {
             var finalCollateralAmount = constants_1.BN_ZERO;
             if (!inputDeltaAmount.isZero()) {
                 if (inputTokenCustodyAccount.publicKey.equals(collateralTokenCustodyAccount.publicKey)) {
@@ -1164,12 +1138,12 @@ var PerpetualsClient = (function () {
                     finalCollateralAmount = swapAmountOut;
                 }
             }
-            var entryPriceBN = _this.getEntryPriceSync(side, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount);
+            var entryPriceUsdBN = _this.getEntryPriceUsdSync(side, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount);
             var openFeeUsd = constants_1.BN_ZERO;
             if (sizeDeltaAmount != constants_1.BN_ZERO) {
-                var newEntryPriceOracle = new OraclePrice_1.OraclePrice({ price: entryPriceBN, exponent: new anchor_1.BN(constants_1.PRICE_DECIMALS).neg(), confidence: marketTokenPrice.confidence, timestamp: marketTokenPrice.timestamp });
-                var sizeDeltaUsd = newEntryPriceOracle.getAssetAmountUsd(sizeDeltaAmount, marketTokenCustodyAccount.decimals);
-                openFeeUsd = sizeDeltaUsd.mul(marketTokenCustodyAccount.fees.openPosition).div(new anchor_1.BN(constants_1.RATE_POWER));
+                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) {
                 var data = __assign({}, types_1.DEFAULT_POSITION);
@@ -1177,15 +1151,22 @@ var PerpetualsClient = (function () {
             }
             else {
                 positionAccount = positionAccount.clone();
-                entryPriceBN = _this.getAveragePriceSync(positionAccount.price, positionAccount.sizeAmount, entryPriceBN, sizeDeltaAmount);
+                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
+                })
+                    .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: entryPriceBN, exponent: new anchor_1.BN(constants_1.PRICE_DECIMALS).neg(), confidence: marketTokenPrice.confidence, timestamp: marketTokenPrice.timestamp });
-            var sizeAmountUsd = entryOraclePrice.getAssetAmountUsd(sizeAmount, marketTokenCustodyAccount.decimals);
+            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);
             }
@@ -1193,99 +1174,168 @@ var PerpetualsClient = (function () {
                 return new anchor_1.BN(Number.MAX_SAFE_INTEGER);
             }
         };
-        this.getEntryPriceAndFeeSync = function (positionAccount, collateralDeltaAmount, sizeDeltaAmount, side, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp) {
+        this.getEntryPriceAndFeeSync = function (positionAccount, marketCorrelation, collateralDeltaAmount, sizeDeltaAmount, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, discountBps) {
+            if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
             if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
                 throw new Error("Delta Amounts cannot be negative.");
             }
-            var entryPriceBN = _this.getEntryPriceSync(side, marketPrice, marketEmaPrice, marketCustodyAccount);
+            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 = oracleEntryPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
+                positionAccount.sizeUsd = sizeUsd;
+                positionAccount.sizeDecimals = targetCustodyAccount.decimals;
+                positionAccount.collateralDecimals = collateralCustodyAccount.decimals;
+                positionAccount.lockedDecimals = collateralCustodyAccount.decimals;
             }
             else {
                 positionAccount = positionAccount.clone();
-                entryPriceBN = _this.getAveragePriceSync(positionAccount.price, positionAccount.sizeAmount, entryPriceBN, sizeDeltaAmount);
+                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
+                })
+                    .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 interestAmountUsd = _this.getInterestAmountUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
-            var liquidationPrice = _this.getLiquidationPriceSync(positionAccount.collateralAmount, positionAccount.sizeAmount, entryPriceBN, interestAmountUsd, positionAccount.unrealizedLossUsd, side, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount);
-            var entryOraclePrice = new OraclePrice_1.OraclePrice({ price: entryPriceBN, exponent: new anchor_1.BN(constants_1.PRICE_DECIMALS).neg(), confidence: marketPrice.confidence, timestamp: marketPrice.timestamp });
-            var sizeAmountUsd = entryOraclePrice.getAssetAmountUsd(sizeDeltaAmount, marketCustodyAccount.decimals);
+            var lockFeeUsd = _this.getLockFeeUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
+            var liquidationPrice = _this.getLiquidationPriceSync(positionAccount.collateralAmount, positionAccount.sizeAmount, entryPriceUsdBN, lockFeeUsd, positionAccount.unsettledFeesUsd, 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;
             var feeAmount = constants_1.BN_ZERO;
+            var feeUsdAfterDiscount = constants_1.BN_ZERO;
+            var feeAmountAfterDiscount = constants_1.BN_ZERO;
             if (positionAccount !== null && sizeDeltaAmount.isZero()) {
             }
             else {
-                feeUsd = sizeAmountUsd.mul(marketCustodyAccount.fees.openPosition).div(new anchor_1.BN(constants_1.RATE_POWER));
+                feeUsd = sizeAmountUsd.mul(targetCustodyAccount.fees.openPosition).div(new anchor_1.BN(constants_1.RATE_POWER));
                 feeAmount = feeUsd.mul(new anchor_1.BN(Math.pow(10, collateralCustodyAccount.decimals))).div(collateralTokenMinOraclePrice.price);
+                if (discountBps.gt(constants_1.BN_ZERO)) {
+                    feeUsdAfterDiscount = feeUsd.mul(discountBps).div(new anchor_1.BN(constants_1.BPS_POWER));
+                    feeUsdAfterDiscount = feeUsd.sub(feeUsdAfterDiscount);
+                    feeAmountAfterDiscount = feeUsdAfterDiscount.mul(new anchor_1.BN(Math.pow(10, collateralCustodyAccount.decimals))).div(collateralTokenMinOraclePrice.price);
+                }
+                else {
+                    feeUsdAfterDiscount = feeUsd;
+                    feeAmountAfterDiscount = feeAmount;
+                }
             }
             return {
-                entryPrice: entryPriceBN,
+                entryPrice: entryPriceUsdBN,
                 feeUsd: feeUsd,
                 feeAmount: feeAmount,
+                feeUsdAfterDiscount: feeUsdAfterDiscount,
+                feeAmountAfterDiscount: feeAmountAfterDiscount,
                 liquidationPrice: liquidationPrice
             };
         };
-        this.getEntryPriceSync = function (side, marketPrice, marketEmaPrice, marketCustodyAccount) {
-            var _a = _this.getMinAndMaxPriceSync(marketPrice, marketEmaPrice, marketCustodyAccount), minPrice = _a.min, maxPrice = _a.max;
-            var entryPriceBN = side ===
-                types_1.Side.Long ?
-                maxPrice.add(maxPrice.mul(marketCustodyAccount.pricing.tradeSpreadLong).div(new anchor_1.BN(constants_1.BPS_POWER))) :
-                minPrice.sub(minPrice.mul(marketCustodyAccount.pricing.tradeSpreadShort).div(new anchor_1.BN(constants_1.BPS_POWER)));
+        this.getEntryPriceUsdSync = function (side, targetPrice, targetEmaPrice, targetCustodyAccount) {
+            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.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.getExitPriceAndFeeSync = function (positionAccount, collateralDeltaAmount, sizeDeltaAmount, side, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp) {
-            positionAccount = positionAccount.clone();
+        this.getExitFeeSync = function (positionAccount, targetCustody, collateralCustodyAccount, collateralPrice, collateralEmaPrice) {
+            var exitFeeUsd = positionAccount.sizeUsd.mul(targetCustody.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
+            var collateralTokenMinOraclePrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
+            var exitFeeAmount = collateralTokenMinOraclePrice.getTokenAmount(exitFeeUsd, collateralCustodyAccount.decimals);
+            return {
+                exitFeeAmount: exitFeeAmount,
+                exitFeeUsd: exitFeeUsd
+            };
+        };
+        this.getExitPriceAndFeeSync = function (positionAccount, marketCorrelation, collateralDeltaAmount, sizeDeltaAmount, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, discountBps) {
+            if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
+            var resultingPositionAccount = positionAccount.clone();
             if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
                 throw new Error("Delta Amounts cannot be negative ");
             }
-            positionAccount.collateralAmount = positionAccount.collateralAmount.sub(collateralDeltaAmount);
-            positionAccount.sizeAmount = positionAccount.sizeAmount.sub(sizeDeltaAmount);
-            if (positionAccount.collateralAmount.isNeg() || positionAccount.sizeAmount.isNeg()) {
+            resultingPositionAccount.collateralAmount = resultingPositionAccount.collateralAmount.sub(collateralDeltaAmount);
+            resultingPositionAccount.sizeAmount = resultingPositionAccount.sizeAmount.sub(sizeDeltaAmount);
+            if (resultingPositionAccount.collateralAmount.isNeg() || resultingPositionAccount.sizeAmount.isNeg()) {
                 throw new Error("cannot remove/close more than collateral/Size");
             }
-            var exitPriceBN = _this.getExitPriceSync(side, marketPrice, marketEmaPrice, marketCustodyAccount);
+            var exitOraclePrice = _this.getExitOraclePriceSync(side, targetPrice, targetEmaPrice, targetCustodyAccount);
             var _a = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount), collateralTokenMinOraclePrice = _a.min, collateralTokenMaxOraclePrice = _a.max;
-            var interestAmountUsd = _this.getInterestAmountUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
-            var interestAmount = interestAmountUsd.mul(new anchor_1.BN(Math.pow(10, collateralCustodyAccount.decimals))).div(collateralTokenMinOraclePrice.price);
-            var exitOraclePrice = new OraclePrice_1.OraclePrice({ price: exitPriceBN, exponent: new anchor_1.BN(constants_1.PRICE_DECIMALS).neg(), confidence: marketPrice.confidence, timestamp: marketPrice.timestamp });
-            var sizeAmountUsd = exitOraclePrice.getAssetAmountUsd(sizeDeltaAmount, marketCustodyAccount.decimals);
-            var feeUsd = sizeAmountUsd.mul(marketCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
-            var feeAmount = collateralTokenMaxOraclePrice.getTokenAmount(feeUsd, collateralCustodyAccount.decimals);
-            var liquidationPrice = _this.getLiquidationPriceSync(positionAccount.collateralAmount, positionAccount.sizeAmount, exitPriceBN, interestAmountUsd, positionAccount.unrealizedLossUsd, side, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount);
+            var lockFeeUsd = _this.getLockFeeUsdForPosition(resultingPositionAccount, collateralCustodyAccount, currentTimestamp);
+            var lockFee = collateralTokenMinOraclePrice.getTokenAmount(lockFeeUsd, collateralCustodyAccount.decimals);
+            var sizeAmountUsd = exitOraclePrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
+            var exitFeeUsd = sizeAmountUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
+            var exitFeeAmount = collateralTokenMaxOraclePrice.getTokenAmount(exitFeeUsd, collateralCustodyAccount.decimals);
+            var exitFeeUsdAfterDiscount = constants_1.BN_ZERO;
+            var exitFeeAmountAfterDiscount = constants_1.BN_ZERO;
+            if (discountBps.gt(constants_1.BN_ZERO)) {
+                exitFeeUsdAfterDiscount = exitFeeUsd.mul(discountBps).div(new anchor_1.BN(constants_1.BPS_POWER));
+                exitFeeUsdAfterDiscount = exitFeeUsd.sub(exitFeeUsdAfterDiscount);
+                exitFeeAmountAfterDiscount = collateralTokenMaxOraclePrice.getTokenAmount(exitFeeUsdAfterDiscount, collateralCustodyAccount.decimals);
+            }
+            else {
+                exitFeeUsdAfterDiscount = exitFeeUsd;
+                exitFeeAmountAfterDiscount = exitFeeAmount;
+            }
+            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, positionEntryPriceUsd, lockFeeUsd, resultingPositionAccount.unsettledFeesUsd, marketCorrelation, side, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount);
             return {
-                exitPrice: exitPriceBN,
-                borrowFeeUsd: interestAmountUsd,
-                borrowFeeAmount: interestAmount,
-                exitFeeUsd: feeUsd,
-                exitFeeAmount: feeAmount,
+                exitPrice: exitOraclePrice.scale_to_exponent(new anchor_1.BN(-1 * constants_1.USD_DECIMALS)).price,
+                borrowFeeUsd: lockFeeUsd,
+                borrowFeeAmount: lockFee,
+                exitFeeUsd: exitFeeUsd,
+                exitFeeAmount: exitFeeAmount,
+                exitFeeUsdAfterDiscount: exitFeeUsdAfterDiscount,
+                exitFeeAmountAfterDiscount: exitFeeAmountAfterDiscount,
                 liquidationPrice: liquidationPrice
             };
         };
-        this.getExitPriceSync = function (side, marketPrice, marketEmaPrice, marketCustodyAccount) {
-            var _a = _this.getMinAndMaxPriceSync(marketPrice, marketEmaPrice, marketCustodyAccount), minPrice = _a.min, maxPrice = _a.max;
-            var exitPriceBN = side ===
-                types_1.Side.Long ?
-                minPrice.sub(minPrice.mul(marketCustodyAccount.pricing.tradeSpreadShort).div(new anchor_1.BN(constants_1.BPS_POWER))) :
-                maxPrice.add(maxPrice.mul(marketCustodyAccount.pricing.tradeSpreadLong).div(new anchor_1.BN(constants_1.BPS_POWER)));
+        this.getExitPriceSync = function (side, targetPrice, targetEmaPrice, targetCustodyAccount) {
+            var _a = _this.getMinAndMaxPriceSync(targetPrice, targetEmaPrice, targetCustodyAccount), minPrice = _a.min, maxPrice = _a.max;
+            var exitPriceBN = (0, types_1.isVariant)(side, 'long') ?
+                minPrice.sub(minPrice.mul(targetCustodyAccount.pricing.tradeSpreadShort).div(new anchor_1.BN(constants_1.BPS_POWER))) :
+                maxPrice.add(maxPrice.mul(targetCustodyAccount.pricing.tradeSpreadLong).div(new anchor_1.BN(constants_1.BPS_POWER)));
             return exitPriceBN;
         };
-        this.getSizeAmountFromLeverageAndCollateral = function (collateralAmtWithFee, leverage, marketToken, collateralToken, side, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount) {
+        this.getExitOraclePriceSync = function (side, targetPrice, targetEmaPrice, targetCustodyAccount) {
+            var _a = _this.getMinAndMaxOraclePriceSync(targetPrice, targetEmaPrice, targetCustodyAccount), minPrice = _a.min, maxPrice = _a.max;
+            if ((0, types_1.isVariant)(side, 'long')) {
+                return minPrice;
+            }
+            else {
+                return maxPrice;
+            }
+        };
+        this.getSizeAmountFromLeverageAndCollateral = function (collateralAmtWithFee, leverage, marketToken, collateralToken, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, discountBps) {
+            if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
-            var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
-            var entryPriceBN = _this.getEntryPriceSync(side, marketPrice, marketEmaPrice, marketCustodyAccount);
-            var entryPriceUi = new bignumber_js_1.default(entryPriceBN.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
+            var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
+            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(marketCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_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));
+                openPosFeeRateUi = openPosFeeRateUi.multipliedBy(new bignumber_js_1.default(1).minus(discountBpsUi));
+            }
             var sizeUsdUi = collateralAmtMinUsdUi.multipliedBy(leverage)
                 .dividedBy(new bignumber_js_1.default(1).plus(openPosFeeRateUi.multipliedBy(leverage)));
-            var sizeAmountUi = sizeUsdUi.dividedBy(entryPriceUi);
+            var sizeAmountUi = sizeUsdUi.dividedBy(entryPriceUsdUi);
             return (0, utils_1.uiDecimalsToNative)(sizeAmountUi.toFixed(marketToken.decimals, bignumber_js_1.default.ROUND_DOWN), marketToken.decimals);
         };
-        this.getSizeAmountWithSwapSync = function (amountIn, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount, poolAumUsdMax, poolConfig) {
+        this.getSizeAmountWithSwapSync = function (amountIn, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, poolAumUsdMax, poolConfig, discountBps) {
+            if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
             var finalCollateralAmount = constants_1.BN_ZERO;
             if (inputTokenCustodyAccount.publicKey.equals(collateralTokenCustodyAccount.publicKey)) {
                 finalCollateralAmount = amountIn;
@@ -1296,37 +1346,46 @@ var PerpetualsClient = (function () {
                 finalCollateralAmount = swapAmountOut;
             }
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount).min;
-            var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
-            var entryPriceBN = _this.getEntryPriceSync(side, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount);
-            var entryPriceUi = new bignumber_js_1.default(entryPriceBN.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
+            var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
+            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(marketTokenCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
+            var openPosFeeRateUi = new bignumber_js_1.default(targetTokenCustodyAccount.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));
+                openPosFeeRateUi = openPosFeeRateUi.multipliedBy(new bignumber_js_1.default(1).minus(discountBpsUi));
+            }
             var sizeUsdUi = collateralAmtMinUsdUi.multipliedBy(leverage)
                 .dividedBy(new bignumber_js_1.default(1).plus(openPosFeeRateUi.multipliedBy(leverage)));
-            var sizeAmountUi = sizeUsdUi.dividedBy(entryPriceUi);
-            return (0, utils_1.uiDecimalsToNative)(sizeAmountUi.toFixed(marketTokenCustodyAccount.decimals, bignumber_js_1.default.ROUND_DOWN), marketTokenCustodyAccount.decimals);
+            var sizeAmountUi = sizeUsdUi.dividedBy(entryPriceUsdUi);
+            return (0, utils_1.uiDecimalsToNative)(sizeAmountUi.toFixed(targetTokenCustodyAccount.decimals, bignumber_js_1.default.ROUND_DOWN), targetTokenCustodyAccount.decimals);
         };
-        this.getCollateralAmountWithFeeFromLeverageAndSize = function (sizeAmount, leverage, marketToken, collateralToken, side, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount) {
+        this.getCollateralAmountWithFeeFromLeverageAndSize = function (sizeAmount, leverage, marketToken, collateralToken, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, discountBps) {
+            if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
-            var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
-            var entryPriceBN = _this.getEntryPriceSync(side, marketPrice, marketEmaPrice, marketCustodyAccount);
-            var entryPriceUi = new bignumber_js_1.default(entryPriceBN.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
-            var openPosFeeRateUi = new bignumber_js_1.default(marketCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
+            var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
+            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));
+                openPosFeeRateUi = openPosFeeRateUi.multipliedBy(new bignumber_js_1.default(1).minus(discountBpsUi));
+            }
             var sizeAmountUi = new bignumber_js_1.default(sizeAmount.toString()).dividedBy(Math.pow(10, marketToken.decimals));
-            var sizeUsdUi = entryPriceUi.multipliedBy(sizeAmountUi);
+            var sizeUsdUi = entryPriceUsdUi.multipliedBy(sizeAmountUi);
             var collateralWithFeeUsdUi = sizeUsdUi.multipliedBy(new bignumber_js_1.default(1).plus(openPosFeeRateUi.multipliedBy(leverage))).dividedBy(leverage);
             var collateralAmtWithFeeUi = collateralWithFeeUsdUi.dividedBy(collateralTokenMinPriceUi);
             return (0, utils_1.uiDecimalsToNative)(collateralAmtWithFeeUi.toFixed(collateralToken.decimals, bignumber_js_1.default.ROUND_DOWN), collateralToken.decimals);
         };
-        this.getCollateralAmountWithSwapSync = function (sizeAmount, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount, poolAumUsdMax, poolConfig) {
+        this.getCollateralAmountWithSwapSync = function (sizeAmount, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, targetTokenPrice, targetTokenEmaPrice, targetTokenCustodyAccount, poolAumUsdMax, poolConfig) {
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount).min;
-            var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
-            var entryPriceBN = _this.getEntryPriceSync(side, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount);
-            var entryPriceUi = new bignumber_js_1.default(entryPriceBN.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
-            var openPosFeeRateUi = new bignumber_js_1.default(marketTokenCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
-            var sizeAmountUi = new bignumber_js_1.default(sizeAmount.toString()).dividedBy(Math.pow(10, marketTokenCustodyAccount.decimals));
-            var sizeUsdUi = entryPriceUi.multipliedBy(sizeAmountUi);
+            var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.USD_DECIMALS));
+            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);
             var collateralWithFeeUsdUi = sizeUsdUi.multipliedBy(new bignumber_js_1.default(1).plus(openPosFeeRateUi.multipliedBy(leverage))).dividedBy(leverage);
             var collateralAmtWithFeeUi = collateralWithFeeUsdUi.dividedBy(collateralTokenMinPriceUi);
             var collateralAmountWithFee = (0, utils_1.uiDecimalsToNative)(collateralAmtWithFeeUi.toFixed(collateralTokenCustodyAccount.decimals, bignumber_js_1.default.ROUND_DOWN), collateralTokenCustodyAccount.decimals);
@@ -1340,56 +1399,76 @@ var PerpetualsClient = (function () {
             }
             return collateralInInputToken;
         };
-        this.getDecreaseSizeCollateralAndFeeSync = function (positionAccount, sizeDeltaUsd, keepLevSame, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp) {
-            if (!marketCustodyAccount.publicKey.equals(positionAccount.custody)) {
+        this.getDecreaseSizeCollateralAndFeeSync = function (positionAccount, marketCorrelation, sizeDeltaUsd, keepLevSame, targetPrice, targetEmaPrice, marketConfig, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, side, poolConfig, discountBps) {
+            if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
+            if (!marketConfig.marketAccount.equals(positionAccount.market)) {
+                throw new Error("marketCustodyAccount mismatch");
+            }
+            if (!targetCustodyAccount.publicKey.equals(marketConfig.targetCustody)) {
                 throw new Error("marketCustodyAccount mismatch");
             }
-            if (!collateralCustodyAccount.publicKey.equals(positionAccount.collateralCustody)) {
+            if (!collateralCustodyAccount.publicKey.equals(marketConfig.collateralCustody)) {
                 throw new Error("collateralCustodyAccount mismatch");
             }
             var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
-            var marketMinMaxPrice = _this.getMinAndMaxOraclePriceSync(marketPrice, marketEmaPrice, marketCustodyAccount);
+            var marketMinMaxPrice = _this.getMinAndMaxOraclePriceSync(targetPrice, targetEmaPrice, targetCustodyAccount);
             var positionDelta = PositionAccount_1.PositionAccount.from(positionAccount.publicKey, __assign({}, positionAccount));
-            var sizeDeltaAmount = marketMinMaxPrice.max.getTokenAmount(sizeDeltaUsd, marketCustodyAccount.decimals);
+            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
+            });
+            var sizeDeltaAmount = positionEntryOraclePrice.getTokenAmount(sizeDeltaUsd, targetCustodyAccount.decimals);
             positionDelta.sizeAmount = sizeDeltaAmount;
-            var decimalPower = new anchor_1.BN(Math.pow(10, marketCustodyAccount.decimals));
+            var decimalPower = new anchor_1.BN(Math.pow(10, targetCustodyAccount.decimals));
             var closeRatio = (positionDelta.sizeAmount.mul(decimalPower)).div(positionAccount.sizeAmount);
             positionDelta.sizeUsd = (positionAccount.sizeUsd.mul(closeRatio)).div(decimalPower);
-            positionDelta.borrowSizeUsd = (positionAccount.borrowSizeUsd.mul(closeRatio)).div(decimalPower);
-            positionDelta.unrealizedLossUsd = (positionAccount.unrealizedLossUsd.mul(closeRatio)).div(decimalPower);
+            positionDelta.unsettledFeesUsd = (positionAccount.unsettledFeesUsd.mul(closeRatio)).div(decimalPower);
             positionDelta.lockedAmount = (positionAccount.lockedAmount.mul(closeRatio)).div(decimalPower);
+            positionDelta.lockedUsd = (positionAccount.lockedUsd.mul(closeRatio)).div(decimalPower);
             positionDelta.collateralAmount = (positionAccount.collateralAmount.mul(closeRatio)).div(decimalPower);
-            var newPnl = _this.getPnlSync(positionDelta, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
+            var newPnl = _this.getPnlSync(positionDelta, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
+            var exitFeeUsd = positionDelta.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
+            if (discountBps.gt(constants_1.BN_ZERO)) {
+                var discount = exitFeeUsd.mul(discountBps).div(new anchor_1.BN(constants_1.BPS_POWER));
+                exitFeeUsd = exitFeeUsd.sub(discount);
+            }
+            var lockFeeUsd = _this.getLockFeeUsdForPosition(positionDelta, collateralCustodyAccount, currentTimestamp);
+            var unsettledFeesUsd = (exitFeeUsd.add(lockFeeUsd)).add(positionDelta.unsettledFeesUsd);
             var currentCollateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(positionDelta.collateralAmount, collateralCustodyAccount.decimals);
-            var availableAmountUsd;
-            if (newPnl.profitUsd.gt(constants_1.BN_ZERO)) {
-                availableAmountUsd = currentCollateralUsd.add(newPnl.profitUsd);
-            }
-            else if (newPnl.lossUsd.lt(currentCollateralUsd)) {
-                availableAmountUsd = currentCollateralUsd.sub(newPnl.lossUsd);
+            var liabilityUsd = newPnl.lossUsd.add(unsettledFeesUsd);
+            var assetsUsd = newPnl.profitUsd.add(currentCollateralUsd);
+            var closeAmount, feesAmount;
+            if (assetsUsd.gte(liabilityUsd)) {
+                closeAmount = collateralMinMaxPrice.max.getTokenAmount(assetsUsd.sub(liabilityUsd), collateralCustodyAccount.decimals);
+                feesAmount = collateralMinMaxPrice.min.getTokenAmount(unsettledFeesUsd, collateralCustodyAccount.decimals);
             }
             else {
-                availableAmountUsd = constants_1.BN_ZERO;
+                closeAmount = constants_1.BN_ZERO;
+                feesAmount = collateralMinMaxPrice.min.getTokenAmount(assetsUsd.sub(newPnl.lossUsd), collateralCustodyAccount.decimals);
             }
-            var closeAmount = collateralMinMaxPrice.max.getTokenAmount(availableAmountUsd, collateralCustodyAccount.decimals);
-            var maxAmount = (positionDelta.lockedAmount.sub(newPnl.exitFeeAmount.add(newPnl.borrowFeeAmount))).add(positionDelta.collateralAmount);
-            closeAmount = anchor_1.BN.min(closeAmount, maxAmount);
             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.borrowSizeUsd = positionAccount.borrowSizeUsd.sub(positionDelta.borrowSizeUsd);
+            newPosition.lockedUsd = positionAccount.lockedUsd.sub(positionDelta.lockedUsd);
             newPosition.lockedAmount = positionAccount.lockedAmount.sub(positionDelta.lockedAmount);
-            newPosition.unrealizedLossUsd = positionAccount.unrealizedLossUsd.sub(positionDelta.unrealizedLossUsd);
+            newPosition.unsettledFeesUsd = positionAccount.unsettledFeesUsd.sub(positionDelta.unsettledFeesUsd);
             newPosition.collateralAmount = positionAccount.collateralAmount.sub(positionDelta.collateralAmount).add(closeAmount);
             newPosition.collateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(newPosition.collateralAmount, collateralCustodyAccount.decimals);
-            var feeUsd = sizeDeltaUsd.mul(marketCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
+            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)) {
+                feeUsdWithDiscount = feeUsd.mul(discountBps).div(new anchor_1.BN(constants_1.BPS_POWER));
+                feeUsdWithDiscount = exitFeeUsd.sub(feeUsdWithDiscount);
+            }
+            else {
+                feeUsdWithDiscount = feeUsd;
+            }
             if (keepLevSame) {
-                var previousPnl = _this.getPnlSync(positionAccount, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
+                var previousPnl = _this.getPnlSync(positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
                 var pnlUsd = previousPnl.profitUsd.sub(previousPnl.lossUsd);
                 var currentlev = _this.getLeverageSync(positionAccount.sizeUsd, positionAccount.collateralAmount, collateralMinMaxPrice.min, collateralCustodyAccount.decimals, pnlUsd);
                 var collateralAmountRecievedUsd = newPosition.collateralUsd.sub(newPosition.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentlev));
                 var collateralAmountReceived = collateralMinMaxPrice.max.getTokenAmount(collateralAmountRecievedUsd, collateralCustodyAccount.decimals);
-                var maxWithdrawableAmount = _this.getMaxWithdrawableAmountSync(newPosition, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
+                var maxWithdrawableAmount = _this.getMaxWithdrawableAmountSync(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig);
                 if (collateralAmountReceived.lt(constants_1.BN_ZERO)) {
                     collateralAmountReceived = constants_1.BN_ZERO;
                     collateralAmountRecievedUsd = constants_1.BN_ZERO;
@@ -1398,17 +1477,22 @@ var PerpetualsClient = (function () {
                     collateralAmountReceived = maxWithdrawableAmount;
                     collateralAmountRecievedUsd = collateralMinMaxPrice.min.getAssetAmountUsd(maxWithdrawableAmount, collateralCustodyAccount.decimals);
                 }
-                var collateralFeeUsd = collateralAmountRecievedUsd.mul(marketCustodyAccount.fees.removeCollateral).div(new anchor_1.BN(constants_1.RATE_POWER));
+                var collateralFeeUsd = collateralAmountRecievedUsd.mul(targetCustodyAccount.fees.removeCollateral).div(new anchor_1.BN(constants_1.RATE_POWER));
+                if (discountBps.gt(constants_1.BN_ZERO)) {
+                    var discount = collateralFeeUsd.mul(discountBps).div(new anchor_1.BN(constants_1.BPS_POWER));
+                    collateralFeeUsd = exitFeeUsd.sub(discount);
+                }
                 newPosition.collateralAmount = newPosition.collateralAmount.sub(collateralAmountReceived);
                 newPosition.collateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(newPosition.collateralAmount, collateralCustodyAccount.decimals);
-                var finalInterestUsd = _this.getInterestAmountUsdForPosition(newPosition, collateralCustodyAccount, currentTimestamp);
-                var finalLiquidationPrice = _this.getLiquidationPriceSync(newPosition.collateralAmount, newPosition.sizeAmount, newPosition.price, finalInterestUsd, newPosition.unrealizedLossUsd, newPosition.side, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount);
-                var finalPnl = _this.getPnlSync(newPosition, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
+                var finalInterestUsd = _this.getLockFeeUsdForPosition(newPosition, collateralCustodyAccount, currentTimestamp);
+                var finalLiquidationPrice = _this.getLiquidationPriceSync(newPosition.collateralAmount, newPosition.sizeAmount, newPosition.entryPrice.price, finalInterestUsd, newPosition.unsettledFeesUsd, 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 newLev = _this.getLeverageSync(newPosition.sizeUsd, newPosition.collateralAmount, collateralMinMaxPrice.min, collateralCustodyAccount.decimals, finalPnlUsd);
                 return {
                     newSizeUsd: newPosition.sizeUsd,
                     feeUsd: feeUsd.add(collateralFeeUsd),
+                    feeUsdWithDiscount: feeUsdWithDiscount.add(collateralFeeUsd),
                     newLev: newLev,
                     liquidationPrice: finalLiquidationPrice,
                     collateralAmountRecieved: collateralAmountReceived,
@@ -1417,9 +1501,9 @@ var PerpetualsClient = (function () {
                 };
             }
             else {
-                var finalInterestUsd = _this.getInterestAmountUsdForPosition(newPosition, collateralCustodyAccount, currentTimestamp);
-                var finalLiquidationPrice = _this.getLiquidationPriceSync(newPosition.collateralAmount, newPosition.sizeAmount, newPosition.price, finalInterestUsd, newPosition.unrealizedLossUsd, newPosition.side, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount);
-                var finalPnl = _this.getPnlSync(newPosition, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
+                var finalInterestUsd = _this.getLockFeeUsdForPosition(newPosition, collateralCustodyAccount, currentTimestamp);
+                var finalLiquidationPrice = _this.getLiquidationPriceSync(newPosition.collateralAmount, newPosition.sizeAmount, newPosition.entryPrice.price, finalInterestUsd, newPosition.unsettledFeesUsd, 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 newLev = _this.getLeverageSync(newPosition.sizeUsd, newPosition.collateralAmount, collateralMinMaxPrice.min, collateralCustodyAccount.decimals, finalPnlUsd);
                 var collateralAmountReceived = newPosition.collateralAmount.sub(positionAccount.collateralAmount);
@@ -1429,6 +1513,7 @@ var PerpetualsClient = (function () {
                 return {
                     newSizeUsd: newPosition.sizeUsd,
                     feeUsd: feeUsd,
+                    feeUsdWithDiscount: feeUsdWithDiscount,
                     newLev: newLev,
                     liquidationPrice: finalLiquidationPrice,
                     collateralAmountRecieved: collateralAmountReceived,
@@ -1437,41 +1522,38 @@ var PerpetualsClient = (function () {
                 };
             }
         };
-        this.getFinalCloseAmountSync = function (positionAccount, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp) {
+        this.getFinalCloseAmountSync = function (positionAccount, marketCorrelation, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig) {
             var position = PositionAccount_1.PositionAccount.from(positionAccount.publicKey, __assign({}, positionAccount));
             var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
             var collateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(position.collateralAmount, collateralCustodyAccount.decimals);
-            var newPnl = _this.getPnlSync(position, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
-            var pnlUsd;
-            if (newPnl.profitUsd.gt(constants_1.BN_ZERO)) {
-                pnlUsd = newPnl.profitUsd;
-            }
-            else if (newPnl.lossUsd.lt(collateralUsd)) {
-                pnlUsd = newPnl.lossUsd.neg();
+            var newPnl = _this.getPnlSync(position, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
+            var exitPriceAndFee = _this.getExitPriceAndFeeSync(positionAccount, marketCorrelation, positionAccount.collateralAmount, positionAccount.sizeAmount, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
+            var unsettledFeesUsd = (exitPriceAndFee.exitFeeUsd.add(exitPriceAndFee.borrowFeeUsd)).add(positionAccount.unsettledFeesUsd);
+            var liabilityUsd = newPnl.lossUsd.add(unsettledFeesUsd);
+            var assetsUsd = newPnl.profitUsd.add(collateralMinMaxPrice.min.getAssetAmountUsd(positionAccount.collateralAmount, positionAccount.collateralDecimals));
+            var closeAmount, feesAmount;
+            if (assetsUsd.gt(liabilityUsd)) {
+                closeAmount = collateralMinMaxPrice.max.getTokenAmount(assetsUsd.sub(liabilityUsd), position.collateralDecimals);
+                feesAmount = collateralMinMaxPrice.min.getTokenAmount(unsettledFeesUsd, positionAccount.collateralDecimals);
             }
             else {
-                pnlUsd = constants_1.BN_ZERO;
+                closeAmount = constants_1.BN_ZERO;
+                feesAmount = collateralMinMaxPrice.min.getTokenAmount(assetsUsd.sub(newPnl.lossUsd), positionAccount.collateralDecimals);
             }
-            var finalUsd = collateralUsd.add(pnlUsd);
-            var finalAmount = constants_1.BN_ZERO;
-            var feeUsd = newPnl.exitFeeUsd.add(newPnl.borrowFeeUsd);
-            if (!finalUsd.isNeg()) {
-                finalAmount = collateralMinMaxPrice.min.getTokenAmount(finalUsd, collateralCustodyAccount.decimals);
-            }
-            return { finalAmount: finalAmount, feeUsd: feeUsd };
+            return { closeAmount: closeAmount, feesAmount: feesAmount };
         };
-        this.getMaxWithdrawableAmountSync = function (positionAccount, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, errorBandwidthPercentageUi) {
+        this.getMaxWithdrawableAmountSync = 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");
             }
-            var MAX_INIT_LEVERAGE = marketCustodyAccount.pricing.maxInitialLeverage.mul(new anchor_1.BN(100 - errorBandwidthPercentageUi)).div(new anchor_1.BN(100));
-            var maxRemoveableCollateralUsdAfterMinRequired = positionAccount.collateralUsd.sub(marketCustodyAccount.pricing.minCollateralUsd.mul(new anchor_1.BN(100 + errorBandwidthPercentageUi)).div(new anchor_1.BN(100)));
+            var MAX_INIT_LEVERAGE = targetCustodyAccount.pricing.maxInitialLeverage.mul(new anchor_1.BN(100 - errorBandwidthPercentageUi)).div(new anchor_1.BN(100));
+            var maxRemoveableCollateralUsdAfterMinRequired = positionAccount.collateralUsd.sub(targetCustodyAccount.pricing.minCollateralUsd.mul(new anchor_1.BN(100 + errorBandwidthPercentageUi)).div(new anchor_1.BN(100)));
             if (maxRemoveableCollateralUsdAfterMinRequired.isNeg()) {
                 console.log("THIS cannot happen but still");
                 return constants_1.BN_ZERO;
             }
-            var profitLoss = _this.getPnlSync(positionAccount, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
+            var profitLoss = _this.getPnlSync(positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
             var _a = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount), collateralMinPrice = _a.min, collateralMaxPrice = _a.max;
             var currentCollateralUsd = collateralMinPrice.getAssetAmountUsd(positionAccount.collateralAmount, collateralCustodyAccount.decimals);
             var availableInitMarginUsd = constants_1.BN_ZERO;
@@ -1495,133 +1577,142 @@ var PerpetualsClient = (function () {
             }
             return maxWithdrawableAmount;
         };
-        this.getCumulativeInterestSync = function (custodyAccount, currentTimestamp) {
-            var cumulativeInterest = constants_1.BN_ZERO;
+        this.getCumulativeLockFeeSync = function (custodyAccount, currentTimestamp) {
+            var cumulativeLockFee = constants_1.BN_ZERO;
             if (currentTimestamp.gt(custodyAccount.borrowRateState.lastUpdate)) {
-                cumulativeInterest = (currentTimestamp
+                cumulativeLockFee = (currentTimestamp
                     .sub(custodyAccount.borrowRateState.lastUpdate))
                     .mul(custodyAccount.borrowRateState.currentRate)
                     .div(new anchor_1.BN(3600))
-                    .add(custodyAccount.borrowRateState.cumulativeInterest);
+                    .add(custodyAccount.borrowRateState.cumulativeLockFee);
             }
             else {
-                cumulativeInterest = custodyAccount.borrowRateState.cumulativeInterest;
+                cumulativeLockFee = custodyAccount.borrowRateState.cumulativeLockFee;
             }
-            return cumulativeInterest;
+            return cumulativeLockFee;
         };
-        this.getInterestAmountUsdForPosition = function (position, collateralCustodyAccount, currentTimestamp) {
-            var cumulativeInterest = _this.getCumulativeInterestSync(collateralCustodyAccount, currentTimestamp);
-            var interestAmountUsd = constants_1.BN_ZERO;
-            if (cumulativeInterest.gt(position.cumulativeInterestSnapshot)) {
-                interestAmountUsd = cumulativeInterest.sub(position.cumulativeInterestSnapshot).mul(position.borrowSizeUsd).div(new anchor_1.BN(constants_1.RATE_POWER));
+        this.getLockFeeUsdForPosition = function (position, collateralCustodyAccount, currentTimestamp) {
+            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));
             }
-            return interestAmountUsd;
+            return lockFeeUsd;
         };
-        this.getLiquidationPriceSync = function (collateralAmount, sizeAmount, entryPrice, interestAmountUsd, unrealizedLossUsd, side, custodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount) {
+        this.getLiquidationPriceSync = function (collateralAmount, sizeAmount, entryPriceUsd, lockFeeUsd, unsettledFeesUsd, marketCorrelation, side, custodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, positionAccount) {
             if (collateralAmount.isZero() || sizeAmount.isZero()) {
                 return constants_1.BN_ZERO;
             }
-            var entryPriceOracle = new OraclePrice_1.OraclePrice({ price: entryPrice, exponent: new anchor_1.BN(constants_1.PRICE_DECIMALS).neg(), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-            var sizeUsd = entryPriceOracle.getAssetAmountUsd(sizeAmount, custodyAccount.decimals);
-            var exitFeeUsd = sizeUsd.mul(custodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
-            var currentUnrealisedUsd = exitFeeUsd.add(interestAmountUsd).add(unrealizedLossUsd);
-            var liablityThresholdUsd = sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(custodyAccount.pricing.maxLeverage).add(currentUnrealisedUsd);
+            var exitFeeUsd = positionAccount.sizeUsd.mul(custodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
+            var unsettledLossUsd = exitFeeUsd.add(lockFeeUsd).add(unsettledFeesUsd);
+            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 maxLossUsd = sizeUsd.add(currentCollateralUsd);
-            var sizeDecimals = (0, utils_1.scaleToExponent)(sizeAmount, new anchor_1.BN(-1 * custodyAccount.decimals), new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
-            var collateralDecimals = (0, utils_1.scaleToExponent)(collateralAmount, new anchor_1.BN(-1 * custodyAccount.decimals), new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
+            var nominalSolvency;
+            if (currentCollateralUsd.gt(liablityThresholdUsd)) {
+                nominalSolvency = true;
+            }
+            else {
+                nominalSolvency = false;
+            }
+            var remainingMarginUsd, requiredMarginUsd;
+            if (nominalSolvency) {
+                remainingMarginUsd = currentCollateralUsd.sub(liablityThresholdUsd);
+                requiredMarginUsd = constants_1.BN_ZERO;
+            }
+            else {
+                remainingMarginUsd = constants_1.BN_ZERO;
+                requiredMarginUsd = liablityThresholdUsd.sub(currentCollateralUsd);
+            }
             var liquidationPrice = constants_1.BN_ZERO;
             if ((0, types_1.isVariant)(side, 'long')) {
-                if (!custodyAccount.isVirtual) {
-                    liquidationPrice = sizeUsd.add(liablityThresholdUsd).mul(new anchor_1.BN(Math.pow(10, constants_1.PRICE_DECIMALS))).div(sizeDecimals.add(collateralDecimals));
+                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 sum = sizeUsd.add(liablityThresholdUsd);
-                    liquidationPrice = sum.sub(currentCollateralUsd).mul(new anchor_1.BN(Math.pow(10, constants_1.PRICE_DECIMALS))).div(sizeDecimals);
+                    var pricePremium = (requiredMarginUsd.mul(new anchor_1.BN(10).pow(new anchor_1.BN(positionAccount.sizeDecimals)))).div(sizeAmount);
+                    liquidationPrice = entryPriceUsd.add(pricePremium);
                 }
             }
             else {
-                liquidationPrice = maxLossUsd.sub(liablityThresholdUsd).mul(new anchor_1.BN(Math.pow(10, constants_1.PRICE_DECIMALS))).div(sizeDecimals);
+                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.getPnlSync = function (positionAccount, marketTokenPrice, marketTokenEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp) {
-            if (positionAccount.sizeUsd.isZero() || positionAccount.price.isZero()) {
+        this.getPnlSync = function (positionAccount, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, delay, poolConfig) {
+            if (positionAccount.sizeUsd.isZero() || positionAccount.entryPrice.price.isZero()) {
                 return {
                     profitUsd: constants_1.BN_ZERO,
                     lossUsd: constants_1.BN_ZERO,
-                    exitFeeUsd: constants_1.BN_ZERO,
-                    borrowFeeUsd: constants_1.BN_ZERO,
-                    exitFeeAmount: constants_1.BN_ZERO,
-                    borrowFeeAmount: constants_1.BN_ZERO
                 };
             }
+            var side = poolConfig.getMarketConfigByPk(positionAccount.market).side;
+            var exitPrice = _this.getExitPriceSync(side, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount);
             var collateralMinPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
-            var exitPriceAndFee = _this.getExitPriceAndFeeSync(positionAccount, positionAccount.collateralAmount, positionAccount.sizeAmount, positionAccount.side, marketTokenPrice, marketTokenEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
-            var unrealizedLossUsd = (exitPriceAndFee.borrowFeeUsd.add(exitPriceAndFee.exitFeeUsd)).add(positionAccount.unrealizedLossUsd);
-            var priceDiffProfit, priceDiffLoss;
-            if ((0, types_1.isVariant)(positionAccount.side, 'long')) {
-                if (exitPriceAndFee.exitPrice.gt(positionAccount.price)) {
-                    priceDiffProfit = exitPriceAndFee.exitPrice.sub(positionAccount.price);
-                    priceDiffLoss = constants_1.BN_ZERO;
+            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
+            })
+                .scale_to_exponent(new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
+            if ((0, types_1.isVariant)(side, 'long')) {
+                if (exitPrice.gt(positionEntryPrice.price)) {
+                    if (currentTimestamp.gt(positionAccount.updateTime.add(delay))) {
+                        priceDiffProfitUsd = exitPrice.sub(positionEntryPrice.price);
+                        priceDiffLossUsd = constants_1.BN_ZERO;
+                    }
+                    else {
+                        priceDiffProfitUsd = constants_1.BN_ZERO;
+                        priceDiffLossUsd = constants_1.BN_ZERO;
+                    }
                 }
                 else {
-                    priceDiffProfit = constants_1.BN_ZERO;
-                    priceDiffLoss = positionAccount.price.sub(exitPriceAndFee.exitPrice);
+                    priceDiffProfitUsd = constants_1.BN_ZERO;
+                    priceDiffLossUsd = positionEntryPrice.price.sub(exitPrice);
                 }
             }
             else {
-                if (exitPriceAndFee.exitPrice.lt(positionAccount.price)) {
-                    priceDiffProfit = positionAccount.price.sub(exitPriceAndFee.exitPrice);
-                    priceDiffLoss = constants_1.BN_ZERO;
+                if (exitPrice.lt(positionEntryPrice.price)) {
+                    if (currentTimestamp.gt(positionAccount.updateTime.add(delay))) {
+                        priceDiffProfitUsd = positionEntryPrice.price.sub(exitPrice);
+                        priceDiffLossUsd = constants_1.BN_ZERO;
+                    }
+                    else {
+                        priceDiffProfitUsd = constants_1.BN_ZERO;
+                        priceDiffLossUsd = constants_1.BN_ZERO;
+                    }
                 }
                 else {
-                    priceDiffProfit = constants_1.BN_ZERO;
-                    priceDiffLoss = exitPriceAndFee.exitPrice.sub(positionAccount.price);
+                    priceDiffProfitUsd = constants_1.BN_ZERO;
+                    priceDiffLossUsd = exitPrice.sub(positionEntryPrice.price);
                 }
             }
             ;
-            if (priceDiffProfit.gt(constants_1.BN_ZERO)) {
-                var priceDiffOracle = new OraclePrice_1.OraclePrice({ price: priceDiffProfit, exponent: new anchor_1.BN(constants_1.PRICE_DECIMALS).neg(), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-                var potentialProfitUsd = priceDiffOracle.getAssetAmountUsd(positionAccount.sizeAmount, marketCustodyAccount.decimals);
-                if (potentialProfitUsd.gte(unrealizedLossUsd)) {
-                    var curProfitUsd = potentialProfitUsd.sub(unrealizedLossUsd);
-                    var maxProfitUsd = collateralMinPrice.getAssetAmountUsd(positionAccount.lockedAmount, collateralCustodyAccount.decimals);
-                    return {
-                        profitUsd: anchor_1.BN.min(maxProfitUsd, curProfitUsd),
-                        lossUsd: constants_1.BN_ZERO,
-                        exitFeeUsd: exitPriceAndFee.exitFeeUsd,
-                        borrowFeeUsd: exitPriceAndFee.borrowFeeUsd,
-                        exitFeeAmount: exitPriceAndFee.exitFeeAmount,
-                        borrowFeeAmount: exitPriceAndFee.borrowFeeAmount
-                    };
-                }
-                else {
-                    var curLossUsd = unrealizedLossUsd.sub(potentialProfitUsd);
-                    var curMarginUsd = collateralMinPrice.getAssetAmountUsd(positionAccount.collateralAmount, collateralCustodyAccount.decimals);
-                    return {
-                        profitUsd: constants_1.BN_ZERO,
-                        lossUsd: anchor_1.BN.min(curLossUsd, curMarginUsd),
-                        exitFeeUsd: exitPriceAndFee.exitFeeUsd,
-                        borrowFeeUsd: exitPriceAndFee.borrowFeeUsd,
-                        exitFeeAmount: exitPriceAndFee.exitFeeAmount,
-                        borrowFeeAmount: exitPriceAndFee.borrowFeeAmount
-                    };
-                }
+            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(priceDiffProfitOracle.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals), collateralMinPrice.getAssetAmountUsd(positionAccount.lockedAmount, positionAccount.lockedDecimals)),
+                    lossUsd: constants_1.BN_ZERO,
+                };
             }
             else {
-                var priceDiffOracle = new OraclePrice_1.OraclePrice({ price: priceDiffLoss, exponent: new anchor_1.BN(constants_1.PRICE_DECIMALS).neg(), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-                var potentialLossUsd = priceDiffOracle.getAssetAmountUsd(positionAccount.sizeAmount, marketCustodyAccount.decimals);
-                potentialLossUsd = potentialLossUsd.add(unrealizedLossUsd);
-                var curMarginUsd = collateralMinPrice.getAssetAmountUsd(positionAccount.collateralAmount, collateralCustodyAccount.decimals);
                 return {
                     profitUsd: constants_1.BN_ZERO,
-                    lossUsd: anchor_1.BN.min(potentialLossUsd, curMarginUsd),
-                    exitFeeUsd: exitPriceAndFee.exitFeeUsd,
-                    borrowFeeUsd: exitPriceAndFee.borrowFeeUsd,
-                    exitFeeAmount: exitPriceAndFee.exitFeeAmount,
-                    borrowFeeAmount: exitPriceAndFee.borrowFeeAmount
+                    lossUsd: priceDiffLossOracle.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
                 };
             }
         };
@@ -1688,7 +1779,7 @@ var PerpetualsClient = (function () {
                 };
             }
         };
-        this.getAssetsUnderManagementUsdSync = function (poolAccount, tokenPrices, tokenEmaPrices, custodies, aum_calc_mode, currentTime) {
+        this.getAssetsUnderManagementUsdSync = function (poolAccount, tokenPrices, tokenEmaPrices, custodies, markets, aumCalcMode, currentTime, poolConfig) {
             var poolAmountUsd = constants_1.BN_ZERO;
             for (var index = 0; index < custodies.length; index++) {
                 if (custodies.length != poolAccount.custodies.length || !custodies[index].publicKey.equals(poolAccount.custodies[index])) {
@@ -1698,36 +1789,39 @@ var PerpetualsClient = (function () {
                     throw Error("token prices length incorrect");
                 }
                 var tokenMinMaxPrice = _this.getMinAndMaxOraclePriceSync(tokenPrices[index], tokenEmaPrices[index], custodies[index]);
-                var aum_token_price = void 0;
-                if ((0, types_1.isVariant)(aum_calc_mode, "min")) {
-                    aum_token_price = tokenMinMaxPrice.min;
-                }
-                else if ((0, types_1.isVariant)(aum_calc_mode, "max")) {
-                    aum_token_price = tokenMinMaxPrice.max;
-                }
-                var token_amount_usd = aum_token_price.getAssetAmountUsd(custodies[index].assets.owned, custodies[index].decimals);
+                var token_amount_usd = tokenMinMaxPrice.max.getAssetAmountUsd(custodies[index].assets.owned, custodies[index].decimals);
                 poolAmountUsd = poolAmountUsd.add(token_amount_usd);
-                if (!custodies[index].isStable) {
-                    var longPnl = _this.getPnlSync(custodies[index].getCollectivePosition(types_1.Side.Long), tokenPrices[index], tokenEmaPrices[index], custodies[index], tokenPrices[index], tokenEmaPrices[index], custodies[index], currentTime);
-                    var shortPnl = _this.getPnlSync(custodies[index].getCollectivePosition(types_1.Side.Short), tokenPrices[index], tokenEmaPrices[index], custodies[index], tokenPrices[0], tokenEmaPrices[0], custodies[0], currentTime);
-                    poolAmountUsd = poolAmountUsd.add(longPnl.lossUsd);
-                    poolAmountUsd = poolAmountUsd.add(shortPnl.lossUsd);
-                    poolAmountUsd = poolAmountUsd.sub(longPnl.profitUsd);
-                    poolAmountUsd = poolAmountUsd.sub(shortPnl.profitUsd);
+            }
+            if ((0, types_1.isVariant)(aumCalcMode, "includePnl")) {
+                var poolEquityUsd = poolAmountUsd;
+                for (var index = 0; index < markets.length; index++) {
+                    if (markets.length != poolAccount.markets.length || !markets[index].publicKey.equals(poolAccount.markets[index])) {
+                        throw Error("incorrect markets");
+                    }
+                    var position = markets[index].getCollectivePosition();
+                    var collectivePnl = _this.getPnlSync(position, tokenPrices[markets[index].targetCustodyId.toNumber()], tokenEmaPrices[markets[index].targetCustodyId.toNumber()], custodies[markets[index].targetCustodyId.toNumber()], tokenPrices[markets[index].collateralCustodyId.toNumber()], tokenEmaPrices[markets[index].collateralCustodyId.toNumber()], custodies[markets[index].collateralCustodyId.toNumber()], currentTime, custodies[markets[index].targetCustodyId.toNumber()].pricing.delaySeconds, poolConfig);
+                    var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(tokenPrices[markets[index].collateralCustodyId.toNumber()], tokenEmaPrices[markets[index].collateralCustodyId.toNumber()], custodies[markets[index].collateralCustodyId.toNumber()]);
+                    var collectiveCollateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(position.collateralAmount, position.collateralDecimals);
+                    var collectiveLossUsd = anchor_1.BN.min(collectivePnl.lossUsd, collectiveCollateralUsd);
+                    poolEquityUsd = (poolEquityUsd.add(collectiveLossUsd)).sub(collectivePnl.profitUsd);
                 }
+                return { poolAmountUsd: poolAmountUsd, poolEquityUsd: poolEquityUsd };
+            }
+            else {
+                return { poolAmountUsd: poolAmountUsd, poolEquityUsd: constants_1.BN_ZERO };
             }
-            return poolAmountUsd;
         };
-        this.openPosition = function (marketSymbol, collateralSymbol, priceAfterSlippage, collateralWithfee, size, side, poolConfig, skipBalanceChecks) {
+        this.openPosition = function (targetSymbol, collateralSymbol, priceWithSlippage, collateralWithfee, size, side, poolConfig, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege, skipBalanceChecks) {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, marketCustodyConfig, collateralCustodyConfig, userCollateralTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, params, instruction;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userCollateralTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, params, instruction;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey)];
                         case 1:
                             userCollateralTokenAccount = _c.sent();
@@ -1780,42 +1874,37 @@ var PerpetualsClient = (function () {
                             }
                             _c.label = 7;
                         case 7:
-                            positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                                Buffer.from("position"),
-                                publicKey.toBuffer(),
-                                poolConfig.poolAddress.toBuffer(),
-                                marketCustodyConfig.custodyAccount.toBuffer(),
-                                (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
-                            ], this.programId)[0];
+                            positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             params = {
-                                price: priceAfterSlippage,
-                                collateral: collateralWithfee,
-                                size: size,
-                                side: side,
+                                priceWithSlippage: priceWithSlippage,
+                                collateralAmount: collateralWithfee,
+                                sizeAmount: size,
+                                privilege: privilege
                             };
                             return [4, this.program.methods
                                     .openPosition(params)
                                     .accounts({
-                                    delegate: publicKey,
                                     owner: publicKey,
+                                    feePayer: publicKey,
                                     fundingAccount: collateralSymbol == 'SOL' ? wrappedSolAccount.publicKey : userCollateralTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
                                     position: positionAccount,
-                                    custody: marketCustodyConfig.custodyAccount,
-                                    custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: poolConfig.backupOracle,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: targetCustodyConfig.oracleAddress,
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                    collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
+                                    collateralOracleAccount: collateralCustodyConfig.oracleAddress,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    eventAuthority: this.eventAuthority.publicKey,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
+                                    transferAuthority: this.authority.publicKey,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                                }).instruction()];
+                                })
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
+                                    .instruction()];
                         case 8:
                             instruction = _c.sent();
                             instructions.push(instruction);
@@ -1827,17 +1916,18 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.openPositionWithSwap = function (marketSymbol, inputSymbol, collateralSymbol, amountIn, minAmountOut, priceAfterSlippage, size, side, poolConfig, skipBalanceChecks) {
+        this.openPositionWithSwap = function (targetSymbol, collateralSymbol, inputSymbol, amountIn, minAmountOut, priceWithSlippage, size, side, swapPoolConfig, positionPoolConfig, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege, skipBalanceChecks) {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, marketCustodyConfig, collateralCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, positionAccount, custodyAccountMetas, custodyOracleAccountMetas, custodyCustomOracles, _i, _c, custody, poolAumInstruction, instruction;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, outputCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userOutputTokenAccount, marketAccount, positionAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, instruction;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
-                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                            inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
+                            targetCustodyConfig = positionPoolConfig.custodies.find(function (i) { return i.mintKey.equals(positionPoolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            collateralCustodyConfig = positionPoolConfig.custodies.find(function (i) { return i.mintKey.equals(positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            outputCustodyConfig = swapPoolConfig.custodies.find(function (i) { return i.mintKey.equals(swapPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            inputCustodyConfig = swapPoolConfig.custodies.find(function (i) { return i.mintKey.equals(swapPoolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
                             if (inputCustodyConfig.mintKey.equals(collateralCustodyConfig.mintKey)) {
                                 throw "Don't use Swap, just call Open position";
                             }
@@ -1876,7 +1966,7 @@ var PerpetualsClient = (function () {
                             additionalSigners.push(wrappedSolAccount);
                             return [3, 6];
                         case 3:
-                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(inputSymbol).mintKey, publicKey);
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(swapPoolConfig.getTokenFromSymbol(inputSymbol).mintKey, publicKey);
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 4:
                             if (!(_d.sent())) {
@@ -1892,23 +1982,17 @@ var PerpetualsClient = (function () {
                             }
                             _d.label = 6;
                         case 6:
-                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey);
-                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(swapPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey);
+                            return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
                         case 7:
                             if (!(_d.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, swapPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
-                            positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                                Buffer.from("position"),
-                                publicKey.toBuffer(),
-                                poolConfig.poolAddress.toBuffer(),
-                                marketCustodyConfig.custodyAccount.toBuffer(),
-                                (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
-                            ], this.programId)[0];
+                            marketAccount = positionPoolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            positionAccount = positionPoolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
-                            custodyCustomOracles = [];
-                            for (_i = 0, _c = poolConfig.custodies; _i < _c.length; _i++) {
+                            for (_i = 0, _c = swapPoolConfig.custodies; _i < _c.length; _i++) {
                                 custody = _c[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
@@ -1920,61 +2004,45 @@ var PerpetualsClient = (function () {
                                     isSigner: false,
                                     isWritable: false,
                                 });
-                                custodyCustomOracles.push({
-                                    pubkey: poolConfig.backupOracle,
-                                    isSigner: false,
-                                    isWritable: false,
-                                });
                             }
-                            return [4, this.program.methods
-                                    .updatePoolAum()
-                                    .accounts({
-                                    payer: publicKey,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), custodyCustomOracles, true))
-                                    .instruction()];
-                        case 8:
-                            poolAumInstruction = _d.sent();
-                            preInstructions.push(poolAumInstruction);
                             return [4, this.programPerpComposability.methods
                                     .swapAndOpen({
                                     amountIn: amountIn,
                                     minAmountOut: minAmountOut,
-                                    openPrice: priceAfterSlippage,
-                                    openSize: size,
-                                    side: side,
+                                    openPriceWithSlippage: priceWithSlippage,
+                                    openSizeAmount: size,
+                                    privilege: privilege
                                 })
                                     .accounts({
-                                    delegate: publicKey,
+                                    perpProgram: this.programId,
                                     owner: publicKey,
                                     fundingAccount: inputSymbol == 'SOL' ? wrappedSolAccount.publicKey : userInputTokenAccount,
-                                    receivingAccount: userCollateralTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
+                                    receivingAccount: userOutputTokenAccount,
+                                    transferAuthority: swapPoolConfig.transferAuthority,
+                                    perpetuals: swapPoolConfig.perpetuals,
+                                    swapPool: swapPoolConfig.poolAddress,
                                     receivingCustody: inputCustodyConfig.custodyAccount,
                                     receivingCustodyOracleAccount: inputCustodyConfig.oracleAddress,
-                                    receivingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
-                                    dispensingCustody: collateralCustodyConfig.custodyAccount,
-                                    dispensingCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                    dispensingCustodyCustomOracleAccount: poolConfig.backupOracle,
-                                    dispensingCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    dispensingCustody: outputCustodyConfig.custodyAccount,
+                                    dispensingCustodyOracleAccount: outputCustodyConfig.oracleAddress,
+                                    dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
+                                    positionPool: positionPoolConfig.poolAddress,
                                     position: positionAccount,
-                                    custody: marketCustodyConfig.custodyAccount,
-                                    custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: poolConfig.backupOracle,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: targetCustodyConfig.oracleAddress,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralOracleAccount: collateralCustodyConfig.oracleAddress,
+                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    perpProgram: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 })
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
-                        case 9:
+                        case 8:
                             instruction = _d.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -1985,11 +2053,11 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.closePosition = function (marketSymbol, collateralSymbol, priceAfterSlippage, side, poolConfig, createUserATA, closeUsersWSOLATA) {
+        this.closePosition = function (marketSymbol, collateralSymbol, priceWithSlippage, side, poolConfig, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege, createUserATA, closeUsersWSOLATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, collateralCustodyConfig, marketCustodyConfig, positionAccount, params, instruction, closeWsolATAIns, error_2;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, instruction, closeWsolATAIns, error_2;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -2038,39 +2106,35 @@ var PerpetualsClient = (function () {
                             _b.label = 7;
                         case 7:
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                            marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
-                            positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                                Buffer.from("position"),
-                                publicKey.toBuffer(),
-                                poolConfig.poolAddress.toBuffer(),
-                                marketCustodyConfig.custodyAccount.toBuffer(),
-                                (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
-                            ], this.programId)[0];
-                            params = {
-                                price: priceAfterSlippage,
-                            };
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             return [4, this.program.methods
-                                    .closePosition(params)
+                                    .closePosition({
+                                    priceWithSlippage: priceWithSlippage,
+                                    privilege: privilege
+                                })
                                     .accounts({
-                                    delegate: publicKey,
+                                    feePayer: publicKey,
                                     owner: publicKey,
                                     receivingAccount: collateralSymbol == 'SOL' ? wrappedSolAccount.publicKey : userReceivingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
                                     position: positionAccount,
-                                    custody: marketCustodyConfig.custodyAccount,
-                                    custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: poolConfig.backupOracle,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: targetCustodyConfig.oracleAddress,
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                    collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
+                                    collateralOracleAccount: collateralCustodyConfig.oracleAddress,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                                }).instruction()];
+                                })
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
+                                    .instruction()];
                         case 8:
                             instruction = _b.sent();
                             instructions.push(instruction);
@@ -2091,15 +2155,16 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.closePositionWithSwap = function (marketSymbol, outputSymbol, collateralSymbol, minAmountOut, priceAfterSlippage, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, marketCustodyConfig, collateralCustodyConfig, outputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, positionAccount, custodyAccountMetas, custodyOracleAccountMetas, custodyCustomOracles, _i, _a, custody, poolAumInstruction, instruction;
+        this.closePositionWithSwap = function (targetSymbol, outputSymbol, collateralSymbol, minAmountOut, priceAfterSlippage, side, swapPoolConfig, positionPoolConfig, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, inputCustodyConfig, outputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, marketAccount, positionAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody, instruction;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
-                        marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
-                        collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                        outputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(outputSymbol).mintKey); });
+                        targetCustodyConfig = positionPoolConfig.custodies.find(function (i) { return i.mintKey.equals(positionPoolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                        collateralCustodyConfig = positionPoolConfig.custodies.find(function (i) { return i.mintKey.equals(positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                        inputCustodyConfig = swapPoolConfig.custodies.find(function (i) { return i.mintKey.equals(swapPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                        outputCustodyConfig = swapPoolConfig.custodies.find(function (i) { return i.mintKey.equals(swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey); });
                         if (outputCustodyConfig.mintKey.equals(collateralCustodyConfig.mintKey)) {
                             throw "Dont use swap, just call close position";
                         }
@@ -2128,33 +2193,27 @@ var PerpetualsClient = (function () {
                         ];
                         additionalSigners.push(wrappedSolAccount);
                         return [3, 5];
-                    case 2: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey)];
+                    case 2: return [4, (0, spl_token_1.getAssociatedTokenAddress)(swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey)];
                     case 3:
                         userReceivingTokenAccount = _b.sent();
                         return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                     case 4:
                         if (!(_b.sent())) {
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(outputSymbol).mintKey));
+                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey));
                         }
                         _b.label = 5;
                     case 5:
-                        userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey);
+                        userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey);
                         return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
                     case 6:
                         if (!(_b.sent())) {
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                         }
-                        positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                            Buffer.from("position"),
-                            publicKey.toBuffer(),
-                            poolConfig.poolAddress.toBuffer(),
-                            marketCustodyConfig.custodyAccount.toBuffer(),
-                            (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
-                        ], this.programId)[0];
+                        marketAccount = positionPoolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                        positionAccount = positionPoolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                         custodyAccountMetas = [];
                         custodyOracleAccountMetas = [];
-                        custodyCustomOracles = [];
-                        for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                        for (_i = 0, _a = swapPoolConfig.custodies; _i < _a.length; _i++) {
                             custody = _a[_i];
                             custodyAccountMetas.push({
                                 pubkey: custody.custodyAccount,
@@ -2166,57 +2225,41 @@ var PerpetualsClient = (function () {
                                 isSigner: false,
                                 isWritable: false,
                             });
-                            custodyCustomOracles.push({
-                                pubkey: poolConfig.backupOracle,
-                                isSigner: false,
-                                isWritable: false,
-                            });
                         }
-                        return [4, this.program.methods
-                                .updatePoolAum()
-                                .accounts({
-                                payer: publicKey,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), custodyCustomOracles, true))
-                                .instruction()];
-                    case 7:
-                        poolAumInstruction = _b.sent();
-                        preInstructions.push(poolAumInstruction);
                         return [4, this.programPerpComposability.methods
                                 .closeAndSwap({
                                 minAmountOut: minAmountOut,
                                 closePrice: priceAfterSlippage,
                             })
                                 .accounts({
-                                delegate: publicKey,
+                                perpProgram: this.programId,
                                 owner: publicKey,
                                 fundingAccount: userCollateralTokenAccount,
                                 receivingAccount: outputSymbol == 'SOL' ? wrappedSolAccount.publicKey : userReceivingTokenAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                receivingCustody: collateralCustodyConfig.custodyAccount,
-                                receivingCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                receivingCustodyCustomOracleAccount: poolConfig.backupOracle,
-                                receivingCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                transferAuthority: swapPoolConfig.transferAuthority,
+                                perpetuals: swapPoolConfig.perpetuals,
+                                swapPool: swapPoolConfig.poolAddress,
+                                receivingCustody: inputCustodyConfig.custodyAccount,
+                                receivingCustodyOracleAccount: inputCustodyConfig.oracleAddress,
+                                receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
                                 dispensingCustody: outputCustodyConfig.custodyAccount,
                                 dispensingCustodyOracleAccount: outputCustodyConfig.oracleAddress,
-                                dispensingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
+                                positionPool: positionPoolConfig.poolAddress,
                                 position: positionAccount,
-                                custody: marketCustodyConfig.custodyAccount,
-                                custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: poolConfig.backupOracle,
+                                market: marketAccount,
+                                targetCustody: targetCustodyConfig.custodyAccount,
+                                targetOracleAccount: targetCustodyConfig.oracleAddress,
+                                collateralCustody: collateralCustodyConfig.custodyAccount,
+                                collateralOracleAccount: collateralCustodyConfig.oracleAddress,
+                                collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                perpProgram: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
+                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                 .instruction()];
-                    case 8:
+                    case 7:
                         instruction = _b.sent();
                         instructions.push(instruction);
                         return [2, {
@@ -2226,12 +2269,13 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.swap = function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, createUserATA, unWrapSol, skipBalanceChecks) {
+        this.swap = function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks) {
+            if (useFeesPool === void 0) { useFeesPool = false; }
             if (createUserATA === void 0) { createUserATA = true; }
             if (unWrapSol === void 0) { unWrapSol = false; }
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, custodyCustomOracles, _i, _e, custody, poolAumInstruction, params, inx, closeWsolATAIns, err_2;
+                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _i, _e, custody, params, inx, closeWsolATAIns, err_2;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -2287,7 +2331,7 @@ var PerpetualsClient = (function () {
                                     additionalSigners: additionalSigners
                                 }];
                         case 6:
-                            _f.trys.push([6, 22, , 23]);
+                            _f.trys.push([6, 21, , 22]);
                             if (!(userInputTokenSymbol == 'SOL')) return [3, 9];
                             console.log("userInputTokenSymbol === sol", userInputTokenSymbol);
                             wrappedSolAccount = new web3_js_1.Keypair();
@@ -2373,7 +2417,6 @@ var PerpetualsClient = (function () {
                         case 19:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
-                            custodyCustomOracles = [];
                             for (_i = 0, _e = poolConfig.custodies; _i < _e.length; _i++) {
                                 custody = _e[_i];
                                 custodyAccountMetas.push({
@@ -2386,33 +2429,15 @@ var PerpetualsClient = (function () {
                                     isSigner: false,
                                     isWritable: false,
                                 });
-                                custodyCustomOracles.push({
-                                    pubkey: poolConfig.backupOracle,
-                                    isSigner: false,
-                                    isWritable: false,
-                                });
                             }
-                            return [4, this.program.methods
-                                    .updatePoolAum()
-                                    .accounts({
-                                    payer: publicKey,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), custodyCustomOracles, true))
-                                    .instruction()];
-                        case 20:
-                            poolAumInstruction = _f.sent();
-                            preInstructions.push(poolAumInstruction);
                             params = {
                                 amountIn: amountIn,
                                 minAmountOut: minAmountOut,
+                                useFeesPool: useFeesPool
                             };
                             return [4, this.program.methods
                                     .swap(params)
                                     .accounts({
-                                    delegate: publicKey,
                                     owner: publicKey,
                                     fundingAccount: userInputTokenSymbol == 'SOL' ? wrappedSolAccount.publicKey : userInputTokenAccount,
                                     receivingAccount: userOutputTokenSymbol == 'SOL' ? wrappedSolAccount.publicKey : userOutputTokenAccount,
@@ -2421,31 +2446,30 @@ var PerpetualsClient = (function () {
                                     pool: poolConfig.poolAddress,
                                     receivingCustody: userInputCustodyConfig.custodyAccount,
                                     receivingCustodyOracleAccount: userInputCustodyConfig.oracleAddress,
-                                    receivingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     receivingCustodyTokenAccount: userInputCustodyConfig.tokenAccount,
                                     dispensingCustody: userOutputCustodyConfig.custodyAccount,
                                     dispensingCustodyOracleAccount: userOutputCustodyConfig.oracleAddress,
-                                    dispensingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
+                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
-                        case 21:
+                        case 20:
                             inx = _f.sent();
                             instructions.push(inx);
                             if (userOutputTokenSymbol == 'SOL' && unWrapSol) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userOutputTokenAccount, publicKey, publicKey);
                                 instructions.push(closeWsolATAIns);
                             }
-                            return [3, 23];
-                        case 22:
+                            return [3, 22];
+                        case 21:
                             err_2 = _f.sent();
                             console.error("perpClient Swap error:: ", err_2);
                             throw err_2;
-                        case 23: return [2, {
+                        case 22: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -2453,17 +2477,18 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.addCollateral = function (collateralWithFee, marketSymbol, collateralSymbol, positionPubKey, poolConfig, skipBalanceChecks) {
+        this.addCollateral = function (collateralWithFee, targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, skipBalanceChecks) {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, collateralCustodyConfig, marketCustodyConfig, userPayingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, solBal, tokenAccountBalance, _b, instruction;
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, userPayingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, solBal, tokenAccountBalance, _b, instruction;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                            marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
-                            if (!collateralCustodyConfig || !marketCustodyConfig) {
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            if (!collateralCustodyConfig || !targetCustodyConfig) {
                                 throw "payTokenCustody not found";
                             }
                             userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey);
@@ -2523,19 +2548,16 @@ var PerpetualsClient = (function () {
                         case 7: return [4, this.program.methods.addCollateral({
                                 collateralDelta: collateralWithFee
                             }).accounts({
-                                delegate: publicKey,
                                 owner: publicKey,
                                 position: positionPubKey,
+                                market: marketAccount,
                                 fundingAccount: collateralSymbol == 'SOL' ? wrappedSolAccount.publicKey : userPayingTokenAccount,
-                                transferAuthority: poolConfig.transferAuthority,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
-                                custody: marketCustodyConfig.custodyAccount,
-                                custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: poolConfig.backupOracle,
+                                targetCustody: targetCustodyConfig.custodyAccount,
+                                targetOracleAccount: targetCustodyConfig.oracleAddress,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
+                                collateralOracleAccount: collateralCustodyConfig.oracleAddress,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2554,18 +2576,19 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.addCollateralWithSwap = function (marketSymbol, inputSymbol, collateralSymbol, amountIn, minAmountOut, positionPubKey, poolConfig, skipBalanceChecks) {
+        this.addCollateralWithSwap = function (targetSymbol, inputSymbol, collateralSymbol, amountIn, minAmountOut, side, positionPubKey, swapPoolConfig, positionPoolConfig, skipBalanceChecks) {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, collateralCustodyConfig, marketCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, custodyCustomOracles, _i, _c, custody, poolAumInstruction, instruction;
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, outputCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, marketAccount, instruction;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                            marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
-                            inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
-                            if (!collateralCustodyConfig || !marketCustodyConfig || !inputCustodyConfig) {
+                            collateralCustodyConfig = positionPoolConfig.custodies.find(function (i) { return i.mintKey.equals(positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            targetCustodyConfig = positionPoolConfig.custodies.find(function (i) { return i.mintKey.equals(positionPoolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            outputCustodyConfig = swapPoolConfig.custodies.find(function (i) { return i.mintKey.equals(swapPoolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            inputCustodyConfig = swapPoolConfig.custodies.find(function (i) { return i.mintKey.equals(swapPoolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
+                            if (!collateralCustodyConfig || !targetCustodyConfig || !inputCustodyConfig) {
                                 throw "payTokenCustody not found";
                             }
                             if (inputCustodyConfig.mintKey.equals(collateralCustodyConfig.mintKey)) {
@@ -2631,8 +2654,7 @@ var PerpetualsClient = (function () {
                             }
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
-                            custodyCustomOracles = [];
-                            for (_i = 0, _c = poolConfig.custodies; _i < _c.length; _i++) {
+                            for (_i = 0, _c = swapPoolConfig.custodies; _i < _c.length; _i++) {
                                 custody = _c[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
@@ -2644,55 +2666,40 @@ var PerpetualsClient = (function () {
                                     isSigner: false,
                                     isWritable: false,
                                 });
-                                custodyCustomOracles.push({
-                                    pubkey: poolConfig.backupOracle,
-                                    isSigner: false,
-                                    isWritable: false,
-                                });
                             }
-                            return [4, this.program.methods
-                                    .updatePoolAum()
-                                    .accounts({
-                                    payer: publicKey,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), custodyCustomOracles, true))
-                                    .instruction()];
-                        case 8:
-                            poolAumInstruction = _d.sent();
-                            preInstructions.push(poolAumInstruction);
+                            marketAccount = positionPoolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.programPerpComposability.methods.swapAndAddCollateral({
                                     amountIn: amountIn,
                                     minAmountOut: minAmountOut,
                                 }).accounts({
-                                    delegate: publicKey,
+                                    perpProgram: this.programId,
                                     owner: publicKey,
-                                    position: positionPubKey,
                                     fundingAccount: inputSymbol == 'SOL' ? wrappedSolAccount.publicKey : userInputTokenAccount,
                                     receivingAccount: userCollateralTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
+                                    transferAuthority: swapPoolConfig.transferAuthority,
+                                    perpetuals: swapPoolConfig.perpetuals,
+                                    swapPool: swapPoolConfig.poolAddress,
                                     receivingCustody: inputCustodyConfig.custodyAccount,
                                     receivingCustodyOracleAccount: inputCustodyConfig.oracleAddress,
-                                    receivingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
-                                    dispensingCustody: collateralCustodyConfig.custodyAccount,
-                                    dispensingCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                    dispensingCustodyCustomOracleAccount: poolConfig.backupOracle,
-                                    dispensingCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    custody: marketCustodyConfig.custodyAccount,
-                                    custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: poolConfig.backupOracle,
+                                    dispensingCustody: outputCustodyConfig.custodyAccount,
+                                    dispensingCustodyOracleAccount: outputCustodyConfig.oracleAddress,
+                                    dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
+                                    positionPool: positionPoolConfig.poolAddress,
+                                    position: positionPubKey,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: targetCustodyConfig.oracleAddress,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralOracleAccount: collateralCustodyConfig.oracleAddress,
+                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    perpProgram: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
+                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
-                        case 9:
+                        case 8:
                             instruction = _d.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -2703,11 +2710,11 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.removeCollateral = function (collateralWithFee, marketSymbol, collateralSymbol, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA) {
+        this.removeCollateral = function (collateralWithFee, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, collateralCustodyConfig, marketCustodyConfig, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, instruction, closeWsolATAIns, error_3;
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, marketAccount, instruction, closeWsolATAIns, error_3;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -2715,10 +2722,10 @@ var PerpetualsClient = (function () {
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) {
                                 return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey);
                             });
-                            marketCustodyConfig = poolConfig.custodies.find(function (i) {
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) {
                                 return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey);
                             });
-                            if (!collateralCustodyConfig || !marketCustodyConfig) {
+                            if (!collateralCustodyConfig || !targetCustodyConfig) {
                                 throw "collateralCustodyConfig/marketCustodyConfig  not found";
                             }
                             preInstructions = [];
@@ -2765,31 +2772,31 @@ var PerpetualsClient = (function () {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
                             _b.label = 7;
-                        case 7: return [4, this.program.methods
-                                .removeCollateral({
-                                collateralDelta: collateralWithFee,
-                            })
-                                .accounts({
-                                delegate: publicKey,
-                                owner: publicKey,
-                                receivingAccount: collateralSymbol == 'SOL' ? wrappedSolAccount.publicKey : userReceivingTokenAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                position: positionPubKey,
-                                custody: marketCustodyConfig.custodyAccount,
-                                custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: poolConfig.backupOracle,
-                                collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
-                                collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                program: this.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                            })
-                                .instruction()];
+                        case 7:
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            return [4, this.program.methods
+                                    .removeCollateral({
+                                    collateralDelta: collateralWithFee,
+                                })
+                                    .accounts({
+                                    owner: publicKey,
+                                    receivingAccount: collateralSymbol == 'SOL' ? wrappedSolAccount.publicKey : userReceivingTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionPubKey,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: targetCustodyConfig.oracleAddress,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralOracleAccount: collateralCustodyConfig.oracleAddress,
+                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .instruction()];
                         case 8:
                             instruction = _b.sent();
                             instructions.push(instruction);
@@ -2810,15 +2817,16 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.RemoveCollateralWithSwap = function (marketSymbol, collateralSymbol, outputSymbol, minAmountOut, collateralDelta, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, marketCustodyConfig, collateralCustodyConfig, outputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, positionAccount, custodyAccountMetas, custodyOracleAccountMetas, custodyCustomOracles, _i, _a, custody, poolAumInstruction, instruction;
+        this.removeCollateralWithSwap = function (targetSymbol, collateralSymbol, outputSymbol, minAmountOut, collateralDelta, side, swapPoolConfig, positionPoolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, inputCusotdyConfig, outputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, marketAccount, positionAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody, instruction;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
-                        marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
-                        collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                        outputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(outputSymbol).mintKey); });
+                        targetCustodyConfig = positionPoolConfig.custodies.find(function (i) { return i.mintKey.equals(positionPoolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                        collateralCustodyConfig = positionPoolConfig.custodies.find(function (i) { return i.mintKey.equals(positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                        inputCusotdyConfig = swapPoolConfig.custodies.find(function (i) { return i.mintKey.equals(swapPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                        outputCustodyConfig = swapPoolConfig.custodies.find(function (i) { return i.mintKey.equals(swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey); });
                         if (outputCustodyConfig.mintKey.equals(collateralCustodyConfig.mintKey)) {
                             throw "Dont use swap, just call remove collateral";
                         }
@@ -2847,33 +2855,27 @@ var PerpetualsClient = (function () {
                         ];
                         additionalSigners.push(wrappedSolAccount);
                         return [3, 5];
-                    case 2: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey)];
+                    case 2: return [4, (0, spl_token_1.getAssociatedTokenAddress)(swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey)];
                     case 3:
                         userReceivingTokenAccount = _b.sent();
                         return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                     case 4:
                         if (!(_b.sent())) {
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(outputSymbol).mintKey));
+                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey));
                         }
                         _b.label = 5;
                     case 5:
-                        userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey);
+                        userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey);
                         return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
                     case 6:
                         if (!(_b.sent())) {
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                         }
-                        positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                            Buffer.from("position"),
-                            publicKey.toBuffer(),
-                            poolConfig.poolAddress.toBuffer(),
-                            marketCustodyConfig.custodyAccount.toBuffer(),
-                            (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
-                        ], this.programId)[0];
+                        marketAccount = positionPoolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                        positionAccount = positionPoolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                         custodyAccountMetas = [];
                         custodyOracleAccountMetas = [];
-                        custodyCustomOracles = [];
-                        for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                        for (_i = 0, _a = swapPoolConfig.custodies; _i < _a.length; _i++) {
                             custody = _a[_i];
                             custodyAccountMetas.push({
                                 pubkey: custody.custodyAccount,
@@ -2885,57 +2887,41 @@ var PerpetualsClient = (function () {
                                 isSigner: false,
                                 isWritable: false,
                             });
-                            custodyCustomOracles.push({
-                                pubkey: poolConfig.backupOracle,
-                                isSigner: false,
-                                isWritable: false,
-                            });
                         }
-                        return [4, this.program.methods
-                                .updatePoolAum()
-                                .accounts({
-                                payer: publicKey,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), custodyCustomOracles, true))
-                                .instruction()];
-                    case 7:
-                        poolAumInstruction = _b.sent();
-                        preInstructions.push(poolAumInstruction);
                         return [4, this.programPerpComposability.methods
                                 .removeCollateralAndSwap({
                                 minAmountOut: minAmountOut,
                                 collateralDelta: collateralDelta,
                             })
                                 .accounts({
-                                delegate: publicKey,
+                                perpProgram: this.programId,
                                 owner: publicKey,
                                 fundingAccount: userCollateralTokenAccount,
                                 receivingAccount: outputSymbol == 'SOL' ? wrappedSolAccount.publicKey : userReceivingTokenAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                receivingCustody: collateralCustodyConfig.custodyAccount,
-                                receivingCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                receivingCustodyCustomOracleAccount: poolConfig.backupOracle,
-                                receivingCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                transferAuthority: swapPoolConfig.transferAuthority,
+                                perpetuals: swapPoolConfig.perpetuals,
+                                swapPool: swapPoolConfig.poolAddress,
+                                receivingCustody: inputCusotdyConfig.custodyAccount,
+                                receivingCustodyOracleAccount: inputCusotdyConfig.oracleAddress,
+                                receivingCustodyTokenAccount: inputCusotdyConfig.tokenAccount,
                                 dispensingCustody: outputCustodyConfig.custodyAccount,
                                 dispensingCustodyOracleAccount: outputCustodyConfig.oracleAddress,
-                                dispensingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
+                                positionPool: positionPoolConfig.poolAddress,
                                 position: positionAccount,
-                                custody: marketCustodyConfig.custodyAccount,
-                                custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: poolConfig.backupOracle,
+                                market: marketAccount,
+                                targetCustody: targetCustodyConfig.custodyAccount,
+                                targetOracleAccount: targetCustodyConfig.oracleAddress,
+                                collateralCustody: collateralCustodyConfig.custodyAccount,
+                                collateralOracleAccount: collateralCustodyConfig.oracleAddress,
+                                collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                perpProgram: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
+                                .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                 .instruction()];
-                    case 8:
+                    case 7:
                         instruction = _b.sent();
                         instructions.push(instruction);
                         return [2, {
@@ -2945,8 +2931,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.increaseSize = function (marketSymbol, collateralSymbol, positionPubKey, poolConfig, price, sizeDelta) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, collateralCustodyConfig, marketCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, params, instruction;
+        this.increaseSize = function (targetSymbol, collateralSymbol, positionPubKey, side, poolConfig, priceWithSlippage, sizeDelta, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, instruction;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2954,38 +2940,41 @@ var PerpetualsClient = (function () {
                         collateralCustodyConfig = poolConfig.custodies.find(function (i) {
                             return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey);
                         });
-                        marketCustodyConfig = poolConfig.custodies.find(function (i) {
-                            return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey);
+                        targetCustodyConfig = poolConfig.custodies.find(function (i) {
+                            return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey);
                         });
-                        if (!collateralCustodyConfig || !marketCustodyConfig) {
+                        marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                        if (!collateralCustodyConfig || !targetCustodyConfig) {
                             throw "collateralCustodyConfig/marketCustodyConfig  not found";
                         }
                         preInstructions = [];
                         instructions = [];
                         postInstructions = [];
                         additionalSigners = [];
-                        params = {
-                            price: price,
-                            sizeDelta: sizeDelta
-                        };
                         return [4, this.program.methods
-                                .increaseSize(params)
+                                .increaseSize({
+                                priceWithSlippage: priceWithSlippage,
+                                sizeDelta: sizeDelta,
+                                privilege: privilege
+                            })
                                 .accounts({
-                                delegate: publicKey,
                                 owner: publicKey,
+                                transferAuthority: poolConfig.transferAuthority,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
                                 position: positionPubKey,
-                                custody: marketCustodyConfig.custodyAccount,
-                                custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: poolConfig.backupOracle,
+                                market: marketAccount,
+                                targetCustody: targetCustodyConfig.custodyAccount,
+                                targetOracleAccount: targetCustodyConfig.oracleAddress,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
+                                collateralOracleAccount: collateralCustodyConfig.oracleAddress,
+                                collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
+                                .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
                                 .instruction()];
                     case 1:
                         instruction = _a.sent();
@@ -2997,8 +2986,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.decreaseSize = function (marketSymbol, collateralSymbol, positionPubKey, poolConfig, priceAfterSlippage, sizeDelta) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, collateralCustodyConfig, marketCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, params, instruction;
+        this.decreaseSize = function (targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, priceWithSlippage, sizeDelta, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, instruction;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -3006,39 +2995,41 @@ var PerpetualsClient = (function () {
                         collateralCustodyConfig = poolConfig.custodies.find(function (i) {
                             return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey);
                         });
-                        marketCustodyConfig = poolConfig.custodies.find(function (i) {
-                            return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey);
+                        targetCustodyConfig = poolConfig.custodies.find(function (i) {
+                            return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey);
                         });
-                        if (!collateralCustodyConfig || !marketCustodyConfig) {
+                        marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                        if (!collateralCustodyConfig || !targetCustodyConfig) {
                             throw "collateralCustodyConfig/marketCustodyConfig  not found";
                         }
                         preInstructions = [];
                         instructions = [];
                         postInstructions = [];
                         additionalSigners = [];
-                        params = {
-                            price: priceAfterSlippage,
-                            sizeDelta: sizeDelta
-                        };
                         return [4, this.program.methods
-                                .decreaseSize(params)
+                                .decreaseSize({
+                                priceWithSlippage: priceWithSlippage,
+                                sizeDelta: sizeDelta,
+                                privilege: privilege
+                            })
                                 .accounts({
-                                delegate: publicKey,
                                 owner: publicKey,
+                                transferAuthority: poolConfig.transferAuthority,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
                                 position: positionPubKey,
-                                custody: marketCustodyConfig.custodyAccount,
-                                custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: poolConfig.backupOracle,
+                                market: marketAccount,
+                                targetCustody: targetCustodyConfig.custodyAccount,
+                                targetOracleAccount: targetCustodyConfig.oracleAddress,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
+                                collateralOracleAccount: collateralCustodyConfig.oracleAddress,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
+                                .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
                                 .instruction()];
                     case 1:
                         instruction = _a.sent();
@@ -3053,9 +3044,9 @@ var PerpetualsClient = (function () {
         this.addLiquidity = function (payTokenSymbol, tokenAmountIn, minLpAmountOut, poolConfig, skipBalanceChecks) {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, custodyCustomOracles, _i, _a, custody, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, poolAumInstruction, instruction, err_3;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, accCreationLamports, lamports, unWrappedSolBalance, _d, tokenAccountBalance, _e, instruction, err_3;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
                             payTokenCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey); });
@@ -3066,18 +3057,18 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _d.label = 1;
+                            _f.label = 1;
                         case 1:
-                            _d.trys.push([1, 13, , 14]);
+                            _f.trys.push([1, 12, , 13]);
                             return [4, (0, spl_token_1.getAssociatedTokenAddress)(payTokenCustodyConfig.mintKey, publicKey)];
                         case 2:
-                            userPayingTokenAccount = _d.sent();
+                            userPayingTokenAccount = _f.sent();
                             return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
                         case 3:
-                            lpTokenAccount = _d.sent();
+                            lpTokenAccount = _f.sent();
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
-                            custodyCustomOracles = [];
+                            markets = [];
                             for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
                                 custody = _a[_i];
                                 custodyAccountMetas.push({
@@ -3090,15 +3081,18 @@ var PerpetualsClient = (function () {
                                     isSigner: false,
                                     isWritable: false,
                                 });
-                                custodyCustomOracles.push({
-                                    pubkey: poolConfig.backupOracle,
+                            }
+                            for (_b = 0, _c = poolConfig.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
+                                markets.push({
+                                    pubkey: market.marketAccount,
                                     isSigner: false,
                                     isWritable: false,
                                 });
                             }
                             return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
                         case 4:
-                            if (!(_d.sent())) {
+                            if (!(_f.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.lpTokenMint));
                             }
                             if (!(payTokenSymbol == 'SOL')) return [3, 7];
@@ -3106,13 +3100,13 @@ var PerpetualsClient = (function () {
                             wrappedSolAccount = new web3_js_1.Keypair();
                             return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
                         case 5:
-                            accCreationLamports = (_d.sent());
+                            accCreationLamports = (_f.sent());
                             console.log("accCreationLamports:", accCreationLamports);
                             lamports = tokenAmountIn.add(new anchor_1.BN(accCreationLamports));
-                            _b = anchor_1.BN.bind;
+                            _d = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
                         case 6:
-                            unWrappedSolBalance = new (_b.apply(anchor_1.BN, [void 0, _d.sent()]))();
+                            unWrappedSolBalance = new (_d.apply(anchor_1.BN, [void 0, _f.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
@@ -3133,64 +3127,50 @@ var PerpetualsClient = (function () {
                             return [3, 10];
                         case 7: return [4, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
                         case 8:
-                            if (!(_d.sent())) {
+                            if (!(_f.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
                             if (!!skipBalanceChecks) return [3, 10];
-                            _c = anchor_1.BN.bind;
+                            _e = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userPayingTokenAccount)];
                         case 9:
-                            tokenAccountBalance = new (_c.apply(anchor_1.BN, [void 0, (_d.sent()).value.amount]))();
+                            tokenAccountBalance = new (_e.apply(anchor_1.BN, [void 0, (_f.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(tokenAmountIn)) {
                                 throw "Insufficient Funds need more ".concat(tokenAmountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            _d.label = 10;
+                            _f.label = 10;
                         case 10: return [4, this.program.methods
-                                .updatePoolAum()
+                                .addLiquidity({
+                                amountIn: tokenAmountIn,
+                                minLpAmountOut: minLpAmountOut
+                            })
                                 .accounts({
-                                payer: publicKey,
+                                owner: publicKey,
+                                fundingAccount: payTokenSymbol == 'SOL' ? wrappedSolAccount.publicKey : userPayingTokenAccount,
+                                lpTokenAccount: lpTokenAccount,
+                                transferAuthority: poolConfig.transferAuthority,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                custody: payTokenCustodyConfig.custodyAccount,
+                                custodyOracleAccount: payTokenCustodyConfig.oracleAddress,
+                                custodyTokenAccount: payTokenCustodyConfig.tokenAccount,
+                                lpTokenMint: poolConfig.lpTokenMint,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                program: this.programId,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
-                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), custodyCustomOracles, true))
+                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                 .instruction()];
                         case 11:
-                            poolAumInstruction = _d.sent();
-                            preInstructions.push(poolAumInstruction);
-                            return [4, this.program.methods
-                                    .addLiquidity({
-                                    amountIn: tokenAmountIn,
-                                    minLpAmountOut: minLpAmountOut
-                                })
-                                    .accounts({
-                                    delegate: publicKey,
-                                    owner: publicKey,
-                                    fundingAccount: payTokenSymbol == 'SOL' ? wrappedSolAccount.publicKey : userPayingTokenAccount,
-                                    lpTokenAccount: lpTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
-                                    custody: payTokenCustodyConfig.custodyAccount,
-                                    custodyOracleAccount: payTokenCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: poolConfig.backupOracle,
-                                    custodyTokenAccount: payTokenCustodyConfig.tokenAccount,
-                                    lpTokenMint: poolConfig.lpTokenMint,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                                })
-                                    .instruction()];
-                        case 12:
-                            instruction = _d.sent();
+                            instruction = _f.sent();
                             instructions.push(instruction);
-                            return [3, 14];
-                        case 13:
-                            err_3 = _d.sent();
+                            return [3, 13];
+                        case 12:
+                            err_3 = _f.sent();
                             console.error("perpClient addLiquidity error:: ", err_3);
                             throw err_3;
-                        case 14: return [2, {
+                        case 13: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -3203,9 +3183,9 @@ var PerpetualsClient = (function () {
             if (createUserATA === void 0) { createUserATA = true; }
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, custodyCustomOracles, _i, _a, custody, lamports, _b, poolAumInstruction, removeLiquidityTx, closeInx, closeWsolATAIns, err_4;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, _d, removeLiquidityTx, closeInx, closeWsolATAIns, err_4;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             recieveTokenCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey); });
                             if (!recieveTokenCustodyConfig) {
@@ -3216,15 +3196,15 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _c.label = 1;
+                            _e.label = 1;
                         case 1:
-                            _c.trys.push([1, 11, , 12]);
+                            _e.trys.push([1, 10, , 11]);
                             return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
                         case 2:
-                            lpTokenAccount = _c.sent();
+                            lpTokenAccount = _e.sent();
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
-                            custodyCustomOracles = [];
+                            markets = [];
                             for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
                                 custody = _a[_i];
                                 custodyAccountMetas.push({
@@ -3237,8 +3217,11 @@ var PerpetualsClient = (function () {
                                     isSigner: false,
                                     isWritable: false,
                                 });
-                                custodyCustomOracles.push({
-                                    pubkey: poolConfig.backupOracle,
+                            }
+                            for (_b = 0, _c = poolConfig.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
+                                markets.push({
+                                    pubkey: market.marketAccount,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -3248,7 +3231,7 @@ var PerpetualsClient = (function () {
                             userReceivingTokenAccount = wrappedSolAccount.publicKey;
                             return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
                         case 3:
-                            lamports = (_c.sent());
+                            lamports = (_e.sent());
                             preInstructions = [
                                 web3_js_1.SystemProgram.createAccount({
                                     fromPubkey: publicKey,
@@ -3266,31 +3249,19 @@ var PerpetualsClient = (function () {
                             return [3, 8];
                         case 4: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey, publicKey)];
                         case 5:
-                            userReceivingTokenAccount = _c.sent();
-                            _b = createUserATA;
-                            if (!_b) return [3, 7];
+                            userReceivingTokenAccount = _e.sent();
+                            _d = createUserATA;
+                            if (!_d) return [3, 7];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                         case 6:
-                            _b = !(_c.sent());
-                            _c.label = 7;
+                            _d = !(_e.sent());
+                            _e.label = 7;
                         case 7:
-                            if (_b) {
+                            if (_d) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey));
                             }
-                            _c.label = 8;
-                        case 8: return [4, this.program.methods
-                                .updatePoolAum()
-                                .accounts({
-                                payer: publicKey,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), custodyCustomOracles, true))
-                                .instruction()];
-                        case 9:
-                            poolAumInstruction = _c.sent();
-                            preInstructions.push(poolAumInstruction);
+                            _e.label = 8;
+                        case 8:
                             console.log("liquidityAmountIn", liquidityAmountIn.toString());
                             return [4, this.program.methods
                                     .removeLiquidity({
@@ -3298,7 +3269,6 @@ var PerpetualsClient = (function () {
                                     minAmountOut: minTokenAmountOut
                                 })
                                     .accounts({
-                                    delegate: publicKey,
                                     owner: publicKey,
                                     receivingAccount: recieveTokenSymbol == 'SOL' ? wrappedSolAccount.publicKey : userReceivingTokenAccount,
                                     lpTokenAccount: lpTokenAccount,
@@ -3307,7 +3277,6 @@ var PerpetualsClient = (function () {
                                     pool: poolConfig.poolAddress,
                                     custody: recieveTokenCustodyConfig.custodyAccount,
                                     custodyOracleAccount: recieveTokenCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: poolConfig.backupOracle,
                                     custodyTokenAccount: recieveTokenCustodyConfig.tokenAccount,
                                     lpTokenMint: poolConfig.lpTokenMint,
                                     eventAuthority: this.eventAuthority.publicKey,
@@ -3315,9 +3284,10 @@ var PerpetualsClient = (function () {
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
-                        case 10:
-                            removeLiquidityTx = _c.sent();
+                        case 9:
+                            removeLiquidityTx = _e.sent();
                             instructions.push(removeLiquidityTx);
                             if (closeLpATA) {
                                 closeInx = (0, spl_token_1.createCloseAccountInstruction)(lpTokenAccount, publicKey, publicKey);
@@ -3327,12 +3297,12 @@ var PerpetualsClient = (function () {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
                                 postInstructions.push(closeWsolATAIns);
                             }
-                            return [3, 12];
-                        case 11:
-                            err_4 = _c.sent();
+                            return [3, 11];
+                        case 10:
+                            err_4 = _e.sent();
                             console.log("perpClient removeLiquidity error:: ", err_4);
                             throw err_4;
-                        case 12: return [2, {
+                        case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -3340,6 +3310,574 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.addReferral = function (nftTradingAccount, nftReferralAccount) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addReferralInstruction, err_5;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .createReferral({})
+                                .accounts({
+                                owner: publicKey,
+                                feePayer: publicKey,
+                                referralAccount: nftReferralAccount,
+                                tradingAccount: nftTradingAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                            })
+                                .instruction()];
+                    case 2:
+                        addReferralInstruction = _a.sent();
+                        instructions.push(addReferralInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_5 = _a.sent();
+                        console.log("perpClient addReferral error:: ", err_5);
+                        throw err_5;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.createNftTradingAccount = function (nftMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, nftTokenAccount, createNftTradingAccountInstruction, err_6;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
+                            Buffer.from("trading"),
+                            nftMint.toBuffer(),
+                        ], this.programId)[0];
+                        metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(nftMint, publicKey)];
+                    case 2:
+                        nftTokenAccount = _a.sent();
+                        return [4, this.program.methods
+                                .createTradingAccount({
+                                collectionIndex: 0
+                            })
+                                .accounts({
+                                feePayer: publicKey,
+                                perpetuals: poolConfig.perpetuals,
+                                nftMint: nftMint,
+                                nftTokenAccount: nftTokenAccount,
+                                tradingAccount: nftTradingAccount,
+                                metadataAccount: metadataAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId
+                            })
+                                .instruction()];
+                    case 3:
+                        createNftTradingAccountInstruction = _a.sent();
+                        instructions.push(createNftTradingAccountInstruction);
+                        return [3, 5];
+                    case 4:
+                        err_6 = _a.sent();
+                        console.log("perpClient createNftAccount error:: ", err_6);
+                        throw err_6;
+                    case 5: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.updateNftAccount = function (nftMint) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, updateNftTradingAccountInstruction, err_7;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
+                            Buffer.from("trading"),
+                            nftMint.toBuffer(),
+                        ], this.programId)[0];
+                        nftReferralAccount = web3_js_1.PublicKey.findProgramAddressSync([
+                            Buffer.from("referral"),
+                            publicKey.toBuffer(),
+                        ], this.programId)[0];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(nftMint, publicKey)];
+                    case 2:
+                        nftTokenAccount = _a.sent();
+                        return [4, this.program.methods
+                                .updateTradingAccount({})
+                                .accounts({
+                                owner: publicKey,
+                                feePayer: publicKey,
+                                nftTokenAccount: nftTokenAccount,
+                                referralAccount: nftReferralAccount,
+                                tradingAccount: nftTradingAccount
+                            })
+                                .instruction()];
+                    case 3:
+                        updateNftTradingAccountInstruction = _a.sent();
+                        instructions.push(updateNftTradingAccountInstruction);
+                        return [3, 5];
+                    case 4:
+                        err_7 = _a.sent();
+                        console.log("perpClient updateNftAccount error:: ", err_7);
+                        throw err_7;
+                    case 5: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.levelUp = function (poolConfig, nftMint) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, levelUpInstruction, err_8;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
+                            Buffer.from("trading"),
+                            nftMint.toBuffer(),
+                        ], this.programId)[0];
+                        metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
+                        return [4, this.program.methods
+                                .levelUp({})
+                                .accounts({
+                                owner: publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: poolConfig.poolAddress,
+                                metadataAccount: metadataAccount,
+                                metadataProgram: constants_1.METAPLEX_PROGRAM_ID,
+                                tradingAccount: nftTradingAccount,
+                                transferAuthority: this.authority.publicKey,
+                            })
+                                .instruction()];
+                    case 2:
+                        levelUpInstruction = _a.sent();
+                        instructions.push(levelUpInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_8 = _a.sent();
+                        console.log("perpClient levelUp error:: ", err_8);
+                        throw err_8;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.initStake = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_9;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        lpTokenMint = poolConfig.lpTokenMint;
+                        stakedLpTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
+                        rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
+                        return [4, this.program.methods
+                                .initStaking({})
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: poolConfig.transferAuthority,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: poolConfig.poolAddress,
+                                custody: rewardCustodyConfig.custodyAccount,
+                                lpTokenMint: lpTokenMint,
+                                stakedLpTokenAccount: stakedLpTokenAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        initStakeInstruction = _a.sent();
+                        instructions.push(initStakeInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_9 = _a.sent();
+                        console.log("perpClient InitStaking error:: ", err_9);
+                        throw err_9;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.depositStake = function (depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolFlpTokenAccount, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_10;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        lpTokenMint = poolConfig.lpTokenMint;
+                        poolFlpTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
+                        flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
+                    case 2:
+                        userLpTokenAccount = _a.sent();
+                        return [4, this.program.methods
+                                .depositStake({
+                                depositAmount: depositAmount
+                            })
+                                .accounts({
+                                owner: publicKey,
+                                feePayer: publicKey,
+                                fundingFlpTokenAccount: userLpTokenAccount,
+                                transferAuthority: poolConfig.transferAuthority,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: poolConfig.poolAddress,
+                                flpStakeAccount: flpStakeAccount,
+                                poolFlpTokenAccount: poolFlpTokenAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                            })
+                                .instruction()];
+                    case 3:
+                        depositStakeInstruction = _a.sent();
+                        instructions.push(depositStakeInstruction);
+                        return [3, 5];
+                    case 4:
+                        err_10 = _a.sent();
+                        console.log("perpClient depositStaking error:: ", err_10);
+                        throw err_10;
+                    case 5: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.activeStake = function (rewardSymbol, poolName, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, flpStakeAccountMetas, _i, _a, custody, activateStakeInstruction, err_11;
+            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, 3, , 4]);
+                        rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
+                        rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
+                        pool = this.getPoolKey(poolName);
+                        feeDistributionTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("custody_token_account"), pool.toBuffer(), rewardCustodyMint.toBuffer()], this.programId)[0];
+                        custodyAccountMetas = [];
+                        flpStakeAccountMetas = [];
+                        for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                            custody = _a[_i];
+                            custodyAccountMetas.push({
+                                pubkey: custody.custodyAccount,
+                                isSigner: false,
+                                isWritable: false,
+                            });
+                        }
+                        return [4, this.program.methods
+                                .activateStake({})
+                                .accounts({
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: pool,
+                                rewardCustody: rewardCustodyConfig.custodyAccount,
+                                feeDistributionTokenAccount: feeDistributionTokenAccount,
+                            })
+                                .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), flpStakeAccountMetas, true))
+                                .instruction()];
+                    case 2:
+                        activateStakeInstruction = _b.sent();
+                        instructions.push(activateStakeInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_11 = _b.sent();
+                        console.log("perpClient activateStaking error:: ", err_11);
+                        throw err_11;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.unstakeRequest = function (unstakeAmount, poolName, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolFlpTokenAccount, flpStakeAccount, userLpTokenAccount, unstakeRequestInstruction, err_12;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        lpTokenMint = poolConfig.lpTokenMint;
+                        pool = this.getPoolKey(poolName);
+                        poolFlpTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), pool.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
+                        flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), pool.toBuffer()], this.programId)[0];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
+                    case 2:
+                        userLpTokenAccount = _a.sent();
+                        return [4, this.program.methods
+                                .unstakeRequest({
+                                unstakeAmount: unstakeAmount
+                            })
+                                .accounts({
+                                owner: publicKey,
+                                fundingFlpTokenAccount: userLpTokenAccount,
+                                transferAuthority: poolConfig.transferAuthority,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: pool,
+                                flpStakeAccount: flpStakeAccount,
+                                poolFlpTokenAccount: poolFlpTokenAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                            })
+                                .instruction()];
+                    case 3:
+                        unstakeRequestInstruction = _a.sent();
+                        instructions.push(unstakeRequestInstruction);
+                        return [3, 5];
+                    case 4:
+                        err_12 = _a.sent();
+                        console.log("perpClient unstakeRequest error:: ", err_12);
+                        throw err_12;
+                    case 5: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.deactiveStake = function (rewardSymbol, poolName, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, flpStakeAccountMetas, _i, _a, custody, deactivateStakeInstruction, err_13;
+            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, 3, , 4]);
+                        rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
+                        rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
+                        pool = this.getPoolKey(poolName);
+                        feeDistributionTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("custody_token_account"), pool.toBuffer(), rewardCustodyMint.toBuffer()], this.programId)[0];
+                        custodyAccountMetas = [];
+                        flpStakeAccountMetas = [];
+                        for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                            custody = _a[_i];
+                            custodyAccountMetas.push({
+                                pubkey: custody.custodyAccount,
+                                isSigner: false,
+                                isWritable: false,
+                            });
+                        }
+                        return [4, this.program.methods
+                                .deactivateStake({})
+                                .accounts({
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: pool,
+                                rewardCustody: rewardCustodyConfig.custodyAccount,
+                                feeDistributionTokenAccount: feeDistributionTokenAccount,
+                            })
+                                .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), flpStakeAccountMetas, true))
+                                .instruction()];
+                    case 2:
+                        deactivateStakeInstruction = _b.sent();
+                        instructions.push(deactivateStakeInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_13 = _b.sent();
+                        console.log("perpClient deactivateStaking error:: ", err_13);
+                        throw err_13;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.withdrawStake = function (withdrawAmount, poolName, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolFlpTokenAccount, flpStakeAccount, userLpTokenAccount, withdrawStakeInstruction, err_14;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        lpTokenMint = poolConfig.lpTokenMint;
+                        pool = this.getPoolKey(poolName);
+                        poolFlpTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), pool.toBuffer(), lpTokenMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
+                        flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), pool.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
+                    case 2:
+                        userLpTokenAccount = _a.sent();
+                        return [4, this.program.methods
+                                .withdrawStake({
+                                withdrawAmount: withdrawAmount
+                            })
+                                .accounts({
+                                owner: publicKey,
+                                receivingFlpTokenAccount: userLpTokenAccount,
+                                transferAuthority: poolConfig.transferAuthority,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: pool,
+                                flpStakeAccount: flpStakeAccount,
+                                poolFlpTokenAccount: poolFlpTokenAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                            })
+                                .instruction()];
+                    case 3:
+                        withdrawStakeInstruction = _a.sent();
+                        instructions.push(withdrawStakeInstruction);
+                        return [3, 5];
+                    case 4:
+                        err_14 = _a.sent();
+                        console.log("perpClient withdrawStake error:: ", err_14);
+                        throw err_14;
+                    case 5: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setPoolConfig = function (permissions, oracleAuthority, maxAumUsd, stakingFeeShareBps, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPoolConfigInstruction, err_15;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .setPoolConfig({
+                                permissions: permissions,
+                                oracleAuthority: oracleAuthority,
+                                maxAumUsd: maxAumUsd,
+                                stakingFeeShareBps: stakingFeeShareBps
+                            })
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                pool: poolConfig.poolAddress
+                            })
+                                .instruction()];
+                    case 2:
+                        setPoolConfigInstruction = _a.sent();
+                        instructions.push(setPoolConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_15 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_15);
+                        throw err_15;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_16;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .setPermissions({
+                                permissions: permissions,
+                            })
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                perpetuals: this.perpetuals.publicKey
+                            })
+                                .instruction()];
+                    case 2:
+                        setPermissionsInstruction = _a.sent();
+                        instructions.push(setPermissionsInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_16 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_16);
+                        throw err_16;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
         this.provider = provider;
         (0, anchor_1.setProvider)(provider);
         this.program = new anchor_1.Program(perpetuals_1.IDL, programId);
@@ -3358,6 +3896,19 @@ var PerpetualsClient = (function () {
             return this.toString(10);
         };
     }
+    PerpetualsClient.prototype.getMarketPk = function (targetCustody, collateralCustody, side) {
+        return this.findProgramAddress("market", [
+            targetCustody,
+            collateralCustody,
+            side === 'long' ? [1] : [2],
+        ]).publicKey;
+    };
+    PerpetualsClient.prototype.getPositionKey = function (owner, targetCustody, collateralCustody, side) {
+        return this.findProgramAddress("position", [
+            owner,
+            this.getMarketPk(targetCustody, collateralCustody, side),
+        ]).publicKey;
+    };
     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(-8), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
@@ -3383,37 +3934,71 @@ var PerpetualsClient = (function () {
         }
         return newRatio;
     };
-    PerpetualsClient.prototype.getPriceAfterSlippage = function (isEntry, slippageBps, marketPrice, marketEmaPrice, side, custody) {
+    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 current_price = this.getEntryPriceSync(side, marketPrice, marketEmaPrice, custody);
-            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS));
+            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 current_price.add(spread_i);
+                return { price: current_price.add(spread_i), exponent: targetPrice.exponent.toNumber() };
             }
             else {
                 if (spread_i.lt(current_price)) {
-                    return current_price.sub(spread_i);
+                    return { price: current_price.sub(spread_i), exponent: targetPrice.exponent.toNumber() };
                 }
                 else {
-                    return constants_1.BN_ZERO;
+                    return { price: constants_1.BN_ZERO, exponent: targetPrice.exponent.toNumber() };
                 }
                 ;
             }
         }
         else {
-            var current_price = this.getExitPriceSync(side, marketPrice, marketEmaPrice, custody);
-            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS));
+            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')) {
                 if (spread_i.lt(current_price)) {
-                    return current_price.sub(spread_i);
+                    return { price: current_price.sub(spread_i), exponent: targetPrice.exponent.toNumber() };
                 }
                 else {
-                    return constants_1.BN_ZERO;
+                    return { price: constants_1.BN_ZERO, exponent: targetPrice.exponent.toNumber() };
                 }
                 ;
             }
             else {
-                return current_price.add(spread_i);
+                return { price: current_price.add(spread_i), exponent: targetPrice.exponent.toNumber() };
             }
         }
     };