flash-sdk 12.0.0 → 12.0.1

package/dist/PerpetualsClient.js

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -68,10 +68,7 @@ var bs58_1 = require("bs58");
 var PositionAccount_1 = require("./PositionAccount");
 var types_1 = require("./types");
 var OraclePrice_1 = require("./OraclePrice");
-var perpetuals_1 = require("./idl/perpetuals");
-var perp_composability_1 = require("./idl/perp_composability");
-var fbnft_rewards_1 = require("./idl/fbnft_rewards");
-var reward_distribution_1 = require("./idl/reward_distribution");
+var perpetuals_json_1 = __importDefault(require("./idl/perpetuals.json"));
 var rpc_1 = require("./utils/rpc");
 var utils_1 = require("./utils");
 var constants_1 = require("./constants");
@@ -86,44 +83,83 @@ var PerpetualsClient = (function () {
         if (useExtOracleAccount === void 0) { useExtOracleAccount = false; }
         var _this = this;
         var _a;
-        this.addressLookupTables = [];
+        this.poolAddressLookupTables = new Map();
+        this.poolPusherAddressLookupTables = new Map();
         this.setPrioritizationFee = function (fee) {
             _this.prioritizationFee = fee;
         };
         this.loadAddressLookupTable = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var addresses, _i, _a, address, addressLookupTable, _b, accCreationLamports;
+            var addressLookupTables, _a, accCreationLamports;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4, this.getOrLoadAddressLookupTable(poolConfig)];
+                    case 1:
+                        addressLookupTables = (_b.sent()).addressLookupTables;
+                        if (!(!this.pusherAddressLookupTables || this.pusherAddressLookupTables.isActive() === false)) return [3, 3];
+                        _a = this;
+                        return [4, this.provider.connection.getAddressLookupTable(poolConfig.pusherAddressLookupTableAddress)];
+                    case 2:
+                        _a.pusherAddressLookupTables = (_b.sent()).value;
+                        _b.label = 3;
+                    case 3:
+                        if (!!this.minimumBalanceForRentExemptAccountLamports) return [3, 5];
+                        return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
+                    case 4:
+                        accCreationLamports = (_b.sent());
+                        if (accCreationLamports) {
+                            this.minimumBalanceForRentExemptAccountLamports = accCreationLamports;
+                        }
+                        _b.label = 5;
+                    case 5: return [2];
+                }
+            });
+        }); };
+        this.getOrLoadAddressLookupTable = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var addresses, addressesToLoad, _i, _a, address, addressKey, cached, _b, addressesToLoad_1, address, addressLookupTable, accCreationLamports;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         addresses = [];
-                        _i = 0, _a = poolConfig.addressLookupTableAddresses;
+                        addressesToLoad = [];
+                        for (_i = 0, _a = poolConfig.addressLookupTableAddresses; _i < _a.length; _i++) {
+                            address = _a[_i];
+                            addressKey = address.toBase58();
+                            cached = this.poolAddressLookupTables.get(addressKey);
+                            if (cached) {
+                                addresses.push(cached);
+                            }
+                            else {
+                                addressesToLoad.push(address);
+                            }
+                        }
+                        _b = 0, addressesToLoad_1 = addressesToLoad;
                         _c.label = 1;
                     case 1:
-                        if (!(_i < _a.length)) return [3, 4];
-                        address = _a[_i];
+                        if (!(_b < addressesToLoad_1.length)) return [3, 4];
+                        address = addressesToLoad_1[_b];
                         return [4, this.provider.connection.getAddressLookupTable(address)];
                     case 2:
                         addressLookupTable = (_c.sent()).value;
                         if (addressLookupTable) {
                             addresses.push(addressLookupTable);
+                            this.poolAddressLookupTables.set(address.toBase58(), addressLookupTable);
                         }
                         _c.label = 3;
                     case 3:
-                        _i++;
+                        _b++;
                         return [3, 1];
                     case 4:
-                        this.addressLookupTables = addresses;
-                        _b = this;
-                        return [4, this.provider.connection.getAddressLookupTable(poolConfig.pusherAddressLookupTableAddress)];
-                    case 5:
-                        _b.pusherAddressLookupTables = (_c.sent()).value;
+                        if (!!this.minimumBalanceForRentExemptAccountLamports) return [3, 6];
                         return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                    case 6:
+                    case 5:
                         accCreationLamports = (_c.sent());
                         if (accCreationLamports) {
                             this.minimumBalanceForRentExemptAccountLamports = accCreationLamports;
                         }
-                        return [2];
+                        _c.label = 6;
+                    case 6: return [2, {
+                            addressLookupTables: addresses,
+                        }];
                 }
             });
         }); };
@@ -226,11 +262,6 @@ var PerpetualsClient = (function () {
                 tokenMint,
             ]).publicKey;
         };
-        this.getTradingAccount = function (tradingAccount) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2, this.program.account.trading.fetch(tradingAccount)];
-            });
-        }); };
         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)];
@@ -249,7 +280,7 @@ var PerpetualsClient = (function () {
                         _a.trys.push([1, 3, , 4]);
                         return [4, this.program.methods
                                 .getPositionData({})
-                                .accounts({
+                                .accountsPartial({
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
                                 position: position.publicKey,
@@ -344,7 +375,7 @@ var PerpetualsClient = (function () {
                     case 0: return [4, this.program.account.position.all()];
                     case 1:
                         allPositions = _a.sent();
-                        activePositions = allPositions.filter(function (f) { return !f.account.sizeAmount.isZero(); });
+                        activePositions = allPositions.filter(function (f) { var _a; return !((_a = f.account.sizeAmount) === null || _a === void 0 ? void 0 : _a.isZero()); });
                         return [2, activePositions];
                 }
             });
@@ -354,7 +385,7 @@ var PerpetualsClient = (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        data = (0, bs58_1.encode)(Buffer.concat([marketKey.toBuffer()]));
+                        data = (0, bs58_1.encode)(new Uint8Array(marketKey.toBuffer()));
                         return [4, this.program.account.position.all([
                                 {
                                     memcmp: { bytes: data, offset: 40 }
@@ -371,7 +402,7 @@ var PerpetualsClient = (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        data = (0, bs58_1.encode)(Buffer.concat([marketKey.toBuffer()]));
+                        data = (0, bs58_1.encode)(new Uint8Array(marketKey.toBuffer()));
                         return [4, this.program.account.position.all([
                                 {
                                     memcmp: { bytes: data, offset: 40 }
@@ -379,7 +410,7 @@ var PerpetualsClient = (function () {
                             ])];
                     case 1:
                         allPositions = _a.sent();
-                        activePositions = allPositions.filter(function (f) { return !f.account.sizeAmount.isZero(); });
+                        activePositions = allPositions.filter(function (f) { var _a; return !((_a = f.account.sizeAmount) === null || _a === void 0 ? void 0 : _a.isZero()); });
                         return [2, activePositions];
                 }
             });
@@ -414,7 +445,7 @@ var PerpetualsClient = (function () {
                         collateralCustodyConfig = poolConfig.custodies.find(function (f) { return f.mintKey.equals(collateralMint); });
                         return [4, this.program.methods
                                 .liquidate({})
-                                .accounts({
+                                .accountsPartial({
                                 signer: this.provider.wallet.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
@@ -424,7 +455,6 @@ var PerpetualsClient = (function () {
                                 targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
@@ -707,7 +737,7 @@ var PerpetualsClient = (function () {
             var sizeAmount = positionAccount.sizeAmount.add(sizeDeltaAmount);
             var sizeAmountUsd = entryOraclePrice.getAssetAmountUsd(sizeAmount, targetTokenCustodyAccount.decimals);
             if (enableDebuglogs) {
-                console.log("SDK logs : finalCollateralUsd:", finalCollateralUsd.toString(), "finalCollateralAmount:", finalCollateralAmount.toString(), "sizeAmount:", sizeAmount.toString(), "sizeAmountUsd:", sizeAmountUsd.toString(), "sizeDeltaAmount:", sizeDeltaAmount.toString(), "sizeUsd:", sizeUsd.toString(), "currentCollateralUsdIncludingPnl:", currentCollateralUsdIncludingPnl.toString(), "finalCollateralUsd :", finalCollateralUsd.toString(), "pnlUsd :", pnlUsd.toString());
+                console.log("SDK logs : finalCollateralUsd:", finalCollateralUsd.toString(), "finalCollateralAmount:", finalCollateralAmount.toString(), "size_amount:", sizeAmount.toString(), "sizeAmountUsd:", sizeAmountUsd.toString(), "sizeDeltaAmount:", sizeDeltaAmount.toString(), "sizeUsd:", sizeUsd.toString(), "currentCollateralUsdIncludingPnl:", currentCollateralUsdIncludingPnl.toString(), "finalCollateralUsd :", finalCollateralUsd.toString(), "pnlUsd :", pnlUsd.toString());
             }
             if (currentCollateralUsdIncludingPnl.gt(constants_1.BN_ZERO)) {
                 return sizeAmountUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentCollateralUsdIncludingPnl);
@@ -827,7 +857,7 @@ var PerpetualsClient = (function () {
             if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
                 throw new Error("Delta Amounts cannot be negative ");
             }
-            if (resultingPositionAccount.collateralAmount.isNeg() || resultingPositionAccount.sizeAmount.isNeg()) {
+            if (resultingPositionAccount.collateralUsd.isNeg() || resultingPositionAccount.sizeAmount.isNeg()) {
                 throw new Error("cannot remove/close more than collateral/Size");
             }
             var sizeUsd = targetPrice.getAssetAmountUsd(sizeDeltaAmount, targetCustodyAccount.decimals);
@@ -998,6 +1028,7 @@ var PerpetualsClient = (function () {
             positionDelta.collateralUsd = (positionAccount.collateralUsd.mul(closeRatio)).div(decimalPower);
             positionDelta.unsettledFeesUsd = (positionAccount.unsettledFeesUsd.mul(closeRatio)).div(decimalPower);
             positionDelta.degenSizeUsd = positionAccount.degenSizeUsd.mul(closeRatio).div(decimalPower);
+            positionDelta.priceImpactUsd = (positionAccount.priceImpactUsd.mul(closeRatio)).div(decimalPower);
             var newPnl = _this.getPnlSync(positionDelta, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
             var exitFeeUsd = positionDelta.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             if (discountBps.gt(constants_1.BN_ZERO)) {
@@ -1007,7 +1038,8 @@ var PerpetualsClient = (function () {
             var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionDelta, collateralCustodyAccount, currentTimestamp);
             var totalFeesUsd = (exitFeeUsd.add(lockAndUnsettledFeeUsd));
             var currentCollateralUsd = positionDelta.collateralUsd;
-            var liabilityUsd = newPnl.lossUsd.add(totalFeesUsd);
+            var lossLiabilityUsd = newPnl.lossUsd.add(positionDelta.priceImpactUsd);
+            var liabilityUsd = lossLiabilityUsd.add(totalFeesUsd);
             var assetsUsd = anchor_1.BN.min(newPnl.profitUsd.add(currentCollateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionDelta.lockedAmount, collateralCustodyAccount.decimals));
             if (debugLogs) {
                 console.log("assetsUsd.sub(liabilityUsd):", collateralCustodyAccount.decimals, assetsUsd.toString(), liabilityUsd.toString(), assetsUsd.sub(liabilityUsd).toString());
@@ -1036,6 +1068,7 @@ var PerpetualsClient = (function () {
             newPosition.collateralUsd = positionAccount.collateralUsd.sub(positionDelta.collateralUsd);
             newPosition.unsettledFeesUsd = positionAccount.unsettledFeesUsd.sub(positionDelta.unsettledFeesUsd);
             newPosition.degenSizeUsd = positionAccount.degenSizeUsd.sub(positionDelta.degenSizeUsd);
+            newPosition.priceImpactUsd = positionAccount.priceImpactUsd.sub(positionDelta.priceImpactUsd);
             newPosition.collateralUsd = newPosition.collateralUsd.add(closeAmountUsd);
             var feeUsdWithDiscount = constants_1.BN_ZERO;
             var feeUsd = sizeDeltaUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
@@ -1103,7 +1136,8 @@ var PerpetualsClient = (function () {
             var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
             var exitFeeUsd = positionAccount.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
-            var lossUsd = profitLoss.lossUsd.add(exitFeeUsd).add(lockAndUnsettledFeeUsd);
+            var lossLiabilityUsd = profitLoss.lossUsd.add(positionAccount.priceImpactUsd);
+            var lossUsd = lossLiabilityUsd.add(exitFeeUsd).add(lockAndUnsettledFeeUsd);
             var availableInitMarginUsd = constants_1.BN_ZERO;
             if (profitLoss.lossUsd.lt(positionAccount.collateralUsd)) {
                 availableInitMarginUsd = positionAccount.collateralUsd.sub(lossUsd);
@@ -1142,9 +1176,11 @@ var PerpetualsClient = (function () {
             var position = PositionAccount_1.PositionAccount.from(positionAccount.publicKey, __assign({}, positionAccount));
             var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
             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 collateralAmount = collateralPrice.getTokenAmount(positionAccount.collateralUsd, collateralCustodyAccount.decimals);
+            var exitPriceAndFee = _this.getExitPriceAndFeeSync(positionAccount, marketCorrelation, collateralAmount, positionAccount.sizeAmount, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
             var totalFeesUsd = (exitPriceAndFee.exitFeeUsd.add(exitPriceAndFee.borrowFeeUsd));
-            var liabilityUsd = newPnl.lossUsd.add(totalFeesUsd);
+            var lossLiabilityUsd = newPnl.lossUsd.add(positionAccount.priceImpactUsd);
+            var liabilityUsd = lossLiabilityUsd.add(totalFeesUsd);
             var assetsUsd = anchor_1.BN.min(newPnl.profitUsd.add(positionAccount.collateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionAccount.lockedAmount, collateralCustodyAccount.decimals));
             var closeAmountUsd, feesAmountUsd;
             if (assetsUsd.gt(liabilityUsd)) {
@@ -1199,7 +1235,8 @@ var PerpetualsClient = (function () {
             var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
             var exitFeeUsd = positionAccount.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
-            var lossUsd = profitLoss.lossUsd.add(exitFeeUsd).add(lockAndUnsettledFeeUsd);
+            var lossLiabilityUsd = profitLoss.lossUsd.add(positionAccount.priceImpactUsd);
+            var lossUsd = lossLiabilityUsd.add(exitFeeUsd).add(lockAndUnsettledFeeUsd);
             var currentCollateralUsd = positionAccount.collateralUsd;
             var availableInitMarginUsd = constants_1.BN_ZERO;
             if (profitLoss.lossUsd.lt(currentCollateralUsd)) {
@@ -1411,7 +1448,7 @@ var PerpetualsClient = (function () {
             }
             return liquidationPrice.price.isNeg() ? zeroOraclePrice : liquidationPrice;
         };
-        this.getMaxProfitPriceSync = function (entryPrice, marketCorrelation, side, collateralPrice, positionAccount) {
+        this.getMaxProfitPriceSync = function (entryPrice, marketCorrelation, side, collateralPrice, collateralDecimals, positionAccount) {
             var zeroOraclePrice = OraclePrice_1.OraclePrice.from({
                 price: constants_1.BN_ZERO,
                 exponent: constants_1.BN_ZERO,
@@ -1422,7 +1459,7 @@ var PerpetualsClient = (function () {
                 return zeroOraclePrice;
             }
             var priceDiffProfit = OraclePrice_1.OraclePrice.from({
-                price: (collateralPrice.price.mul(positionAccount.lockedAmount)).mul(new anchor_1.BN(10).pow(new anchor_1.BN(positionAccount.sizeDecimals + 3)))
+                price: (collateralPrice.getAssetAmountUsd(positionAccount.lockedAmount, collateralDecimals)).mul(new anchor_1.BN(10).pow(new anchor_1.BN(positionAccount.sizeDecimals + 3)))
                     .div(positionAccount.sizeAmount),
                 exponent: new anchor_1.BN(-1 * constants_1.RATE_DECIMALS),
                 confidence: constants_1.BN_ZERO,
@@ -1561,6 +1598,7 @@ var PerpetualsClient = (function () {
                 return {
                     profitUsd: constants_1.BN_ZERO,
                     lossUsd: constants_1.BN_ZERO,
+                    priceImpactUsd: constants_1.BN_ZERO,
                 };
             }
             var side = poolConfig.getMarketConfigByPk(positionAccount.market).side;
@@ -1583,8 +1621,14 @@ var PerpetualsClient = (function () {
                         priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
                     }
                     else {
-                        priceDiffProfit = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-                        priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                        if (positionAccount.referencePrice.price.gt(positionEntryPrice.price)) {
+                            priceDiffProfit = new OraclePrice_1.OraclePrice({ price: positionAccount.referencePrice.price.sub(positionEntryPrice.price), exponent: positionEntryPrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                            priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                        }
+                        else {
+                            priceDiffProfit = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                            priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                        }
                     }
                 }
                 else {
@@ -1599,8 +1643,14 @@ var PerpetualsClient = (function () {
                         priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
                     }
                     else {
-                        priceDiffProfit = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
-                        priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                        if (positionEntryPrice.price.gt(positionAccount.referencePrice.price)) {
+                            priceDiffProfit = new OraclePrice_1.OraclePrice({ price: positionEntryPrice.price.sub(positionAccount.referencePrice.price), exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                            priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                        }
+                        else {
+                            priceDiffProfit = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                            priceDiffLoss = new OraclePrice_1.OraclePrice({ price: constants_1.BN_ZERO, exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
+                        }
                     }
                 }
                 else {
@@ -1613,19 +1663,96 @@ var PerpetualsClient = (function () {
                 throw new Error("exponent mistach");
             }
             if (priceDiffProfit.price.gt(constants_1.BN_ZERO)) {
+                var grossProfitUsd = priceDiffProfit.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals);
                 return {
-                    profitUsd: priceDiffProfit.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
+                    profitUsd: grossProfitUsd,
                     lossUsd: constants_1.BN_ZERO,
+                    priceImpactUsd: positionAccount.priceImpactUsd,
                 };
             }
             else {
+                var grossLossUsd = priceDiffLoss.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals);
                 return {
                     profitUsd: constants_1.BN_ZERO,
-                    lossUsd: priceDiffLoss.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
+                    lossUsd: grossLossUsd,
+                    priceImpactUsd: positionAccount.priceImpactUsd,
+                };
+            }
+        };
+        this.getPositionMetrics = function (positionAccount, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig) {
+            if (positionAccount.sizeUsd.isZero() || positionAccount.entryPrice.price.isZero()) {
+                var zeroOraclePrice = OraclePrice_1.OraclePrice.from({
+                    price: constants_1.BN_ZERO,
+                    exponent: constants_1.BN_ZERO,
+                    confidence: constants_1.BN_ZERO,
+                    timestamp: constants_1.BN_ZERO
+                });
+                return {
+                    pnl: { profitUsd: constants_1.BN_ZERO, lossUsd: constants_1.BN_ZERO, priceImpactUsd: constants_1.BN_ZERO },
+                    leverage: constants_1.BN_ZERO,
+                    liquidationPrice: zeroOraclePrice,
+                    fees: { exitFeeUsd: constants_1.BN_ZERO, exitFeeAmount: constants_1.BN_ZERO, lockAndUnsettledFeeUsd: constants_1.BN_ZERO }
                 };
             }
+            var side = poolConfig.getMarketConfigByPk(positionAccount.market).side;
+            var entryOraclePrice = 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
+            });
+            var exitOraclePrice = _this.getExitOraclePriceSync(side, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, positionAccount.sizeUsd);
+            var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
+            var _a = _this.getExitFeeSync(positionAccount, targetCustodyAccount, collateralCustodyAccount, collateralPrice, collateralEmaPrice), exitFeeAmount = _a.exitFeeAmount, exitFeeUsd = _a.exitFeeUsd;
+            var pnl;
+            if (!exitOraclePrice.exponent.eq(entryOraclePrice.exponent)) {
+                throw new Error("exponent mismatch");
+            }
+            var pnlResult = _this.getPnlContractHelper(positionAccount, targetTokenPrice, targetTokenEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
+            pnl = {
+                profitUsd: pnlResult.profitUsd,
+                lossUsd: pnlResult.lossUsd,
+                priceImpactUsd: pnlResult.priceImpactUsd,
+            };
+            var liquidationPrice = _this.getLiquidationPriceContractHelper(entryOraclePrice, lockAndUnsettledFeeUsd, side, targetCustodyAccount, positionAccount);
+            var unsettledFeesUsd = exitFeeUsd.add(lockAndUnsettledFeeUsd);
+            var lossUsd = pnl.lossUsd.add(unsettledFeesUsd);
+            var currentMarginUsd = positionAccount.collateralUsd.add(pnl.profitUsd).sub(lossUsd);
+            var leverage;
+            if (currentMarginUsd.gt(constants_1.BN_ZERO)) {
+                leverage = positionAccount.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentMarginUsd);
+            }
+            else {
+                leverage = new anchor_1.BN(Number.MAX_SAFE_INTEGER);
+            }
+            return {
+                pnl: pnl,
+                leverage: leverage,
+                liquidationPrice: liquidationPrice,
+                fees: {
+                    exitFeeUsd: exitFeeUsd,
+                    exitFeeAmount: exitFeeAmount,
+                    lockAndUnsettledFeeUsd: lockAndUnsettledFeeUsd
+                }
+            };
+        };
+        this.getPositionsMetricsBatch = function (positions, priceMap, currentTimestamp) {
+            var results = new Map();
+            for (var _i = 0, positions_1 = positions; _i < positions_1.length; _i++) {
+                var _a = positions_1[_i], positionAccount = _a.positionAccount, targetCustodyAccount = _a.targetCustodyAccount, collateralCustodyAccount = _a.collateralCustodyAccount, poolConfig = _a.poolConfig;
+                var positionKey = positionAccount.publicKey.toBase58();
+                var targetPrices = priceMap.get(targetCustodyAccount.publicKey.toBase58());
+                var collateralPrices = priceMap.get(collateralCustodyAccount.publicKey.toBase58());
+                if (!targetPrices || !collateralPrices) {
+                    continue;
+                }
+                var metrics = _this.getPositionMetrics(positionAccount, targetPrices.price, targetPrices.emaPrice, targetCustodyAccount, collateralPrices.price, collateralPrices.emaPrice, collateralCustodyAccount, currentTimestamp, poolConfig);
+                results.set(positionKey, metrics);
+            }
+            return results;
         };
-        this.getSwapAmountAndFeesSync = function (amountIn, amountOut, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, outputTokenPrice, outputTokenEmaPrice, outputTokenCustodyAccount, poolAumUsdMax, poolConfig) {
+        this.getSwapAmountAndFeesSync = function (amountIn, amountOut, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, outputTokenPrice, outputTokenEmaPrice, outputTokenCustodyAccount, poolAumUsdMax, poolConfig, whitelistedUserAccount) {
+            if (whitelistedUserAccount === void 0) { whitelistedUserAccount = null; }
             if (!amountIn.isZero() && !amountOut.isZero()) {
                 throw new Error("both amountIn and amountOut cannot be non-zero");
             }
@@ -1637,6 +1764,12 @@ var PerpetualsClient = (function () {
                     feeOut: constants_1.BN_ZERO,
                 };
             }
+            var isWhitelistedUser = false;
+            if (whitelistedUserAccount && whitelistedUserAccount.isSwapFeeExempt) {
+                if (whitelistedUserAccount.pool.equals(poolAccount.publicKey) || whitelistedUserAccount.pool.equals(web3_js_1.PublicKey.default)) {
+                    isWhitelistedUser = true;
+                }
+            }
             var newInputTokenPrice, newInputTokenEmaPrice;
             var newOutputTokenPrice, newOutputTokenEmaPrice;
             if (inputTokenPrice.exponent.lte(outputTokenPrice.exponent)) {
@@ -1672,8 +1805,10 @@ var PerpetualsClient = (function () {
                 }
                 var swapPrice = pairPrice.sub(pairPrice.mul(outputTokenCustodyAccount.pricing.swapSpread).div(new anchor_1.BN(constants_1.BPS_POWER)));
                 inputTokenAmount = (0, utils_1.checkedDecimalMul)(amountOut, new anchor_1.BN(-1 * outputTokenCustodyAccount.decimals), swapPrice, inputMinMaxPrice.min.exponent, new anchor_1.BN(-1 * inputTokenCustodyAccount.decimals));
-                feeIn = _this.getFeeHelper(types_1.FeesAction.SwapIn, inputTokenAmount, constants_1.BN_ZERO, inputTokenCustodyAccount, inputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
-                feeOut = _this.getFeeHelper(types_1.FeesAction.SwapOut, constants_1.BN_ZERO, amountOut, outputTokenCustodyAccount, outputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
+                feeIn = isWhitelistedUser ? constants_1.BN_ZERO
+                    : _this.getFeeHelper(types_1.FeesAction.SwapIn, inputTokenAmount, constants_1.BN_ZERO, inputTokenCustodyAccount, inputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
+                feeOut = isWhitelistedUser ? constants_1.BN_ZERO
+                    : _this.getFeeHelper(types_1.FeesAction.SwapOut, constants_1.BN_ZERO, amountOut, outputTokenCustodyAccount, outputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
                 var swapAmount = (0, utils_1.checkedDecimalMul)(amountOut.add(feeOut), new anchor_1.BN(-1 * outputTokenCustodyAccount.decimals), swapPrice, inputMinMaxPrice.min.exponent, new anchor_1.BN(-1 * inputTokenCustodyAccount.decimals)).add(feeIn);
                 return {
                     minAmountIn: swapAmount,
@@ -1693,8 +1828,10 @@ var PerpetualsClient = (function () {
                 }
                 var swapPrice = pairPrice.sub(pairPrice.mul(inputTokenCustodyAccount.pricing.swapSpread).div(new anchor_1.BN(constants_1.BPS_POWER)));
                 outputTokenAmount = (0, utils_1.checkedDecimalMul)(amountIn, new anchor_1.BN(-1 * inputTokenCustodyAccount.decimals), swapPrice, inputMinMaxPrice.min.exponent, new anchor_1.BN(-1 * outputTokenCustodyAccount.decimals));
-                feeIn = _this.getFeeHelper(types_1.FeesAction.SwapIn, amountIn, constants_1.BN_ZERO, inputTokenCustodyAccount, inputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
-                feeOut = _this.getFeeHelper(types_1.FeesAction.SwapOut, constants_1.BN_ZERO, outputTokenAmount, outputTokenCustodyAccount, outputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
+                feeIn = isWhitelistedUser ? constants_1.BN_ZERO
+                    : _this.getFeeHelper(types_1.FeesAction.SwapIn, amountIn, constants_1.BN_ZERO, inputTokenCustodyAccount, inputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
+                feeOut = isWhitelistedUser ? constants_1.BN_ZERO
+                    : _this.getFeeHelper(types_1.FeesAction.SwapOut, constants_1.BN_ZERO, outputTokenAmount, outputTokenCustodyAccount, outputMinMaxPrice.max, poolAumUsdMax, poolAccount, poolConfig).feeAmount;
                 var swapAmount = (0, utils_1.checkedDecimalMul)(amountIn.sub(feeIn), new anchor_1.BN(-1 * inputTokenCustodyAccount.decimals), swapPrice, inputMinMaxPrice.min.exponent, new anchor_1.BN(-1 * outputTokenCustodyAccount.decimals)).sub(feeOut);
                 return {
                     minAmountIn: constants_1.BN_ZERO,
@@ -1826,69 +1963,204 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.getStakedLpTokenPrice = function (poolKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_1, token, _a, custodies_2, custody, _b, _c, market, transaction, backUpOracleInstruction, setCULimitIx, result, index, res;
-            var _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        backUpOracleInstructionPromise = (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true);
-                        custodies = POOL_CONFIG.custodies;
-                        custodyMetas = [];
-                        marketMetas = [];
-                        for (_i = 0, custodies_1 = custodies; _i < custodies_1.length; _i++) {
-                            token = custodies_1[_i];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: token.custodyAccount,
-                            });
-                        }
-                        for (_a = 0, custodies_2 = custodies; _a < custodies_2.length; _a++) {
-                            custody = custodies_2[_a];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: custody.intOracleAccount,
-                            });
-                        }
-                        for (_b = 0, _c = POOL_CONFIG.markets; _b < _c.length; _b++) {
-                            market = _c[_b];
-                            marketMetas.push({
-                                pubkey: market.marketAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        return [4, this.program.methods
-                                .getLpTokenPrice({})
-                                .accounts({
-                                perpetuals: POOL_CONFIG.perpetuals,
-                                pool: poolKey,
-                                lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
-                                .transaction()];
-                    case 1:
-                        transaction = _e.sent();
-                        return [4, backUpOracleInstructionPromise];
-                    case 2:
-                        backUpOracleInstruction = _e.sent();
-                        setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
-                        transaction.instructions.unshift(setCULimitIx);
-                        (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
-                        return [4, this.viewHelper.simulateTransaction(transaction)];
-                    case 3:
-                        result = _e.sent();
-                        index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getLpTokenPrice'; });
-                        res = this.viewHelper.decodeLogs(result, index, 'getLpTokenPrice');
-                        return [2, res.toString()];
-                }
+        this.getLpTokenPriceView = function (poolConfig_1) {
+            var args_1 = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args_1[_i - 1] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([poolConfig_1], args_1, true), void 0, function (poolConfig, includeRemainingAccounts) {
+                var custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market;
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            custodyAccountMetas = [];
+                            custodyOracleAccountMetas = [];
+                            markets = [];
+                            for (_a = 0, _b = poolConfig.custodies; _a < _b.length; _a++) {
+                                custody = _b[_a];
+                                custodyAccountMetas.push({
+                                    pubkey: custody.custodyAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyOracleAccountMetas.push({
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            for (_c = 0, _d = poolConfig.markets; _c < _d.length; _c++) {
+                                market = _d[_c];
+                                markets.push({
+                                    pubkey: market.marketAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            return [4, this.program.methods
+                                    .getLpTokenPrice({})
+                                    .accountsPartial({
+                                    perpetuals: this.perpetuals.publicKey,
+                                    pool: poolConfig.poolAddress,
+                                    lpTokenMint: poolConfig.stakedLpTokenMint,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
+                                    .view()
+                                    .catch(function (err) {
+                                    console.error(err);
+                                    throw err;
+                                })];
+                        case 1: return [2, _e.sent()];
+                    }
+                });
             });
-        }); };
+        };
+        this.getStakedLpTokenPrice = function (poolKey_1, POOL_CONFIG_1) {
+            var args_1 = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([poolKey_1, POOL_CONFIG_1], args_1, true), void 0, function (poolKey, POOL_CONFIG, includeRemainingAccounts) {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_1, token, _b, custodies_2, custody, _c, _d, market, transaction, backUpOracleInstruction, setCULimitIx, addressLookupTables, result, index, res;
+                var _e;
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0:
+                            backUpOracleInstructionPromise = (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true);
+                            custodies = POOL_CONFIG.custodies;
+                            custodyMetas = [];
+                            marketMetas = [];
+                            for (_a = 0, custodies_1 = custodies; _a < custodies_1.length; _a++) {
+                                token = custodies_1[_a];
+                                custodyMetas.push({
+                                    isSigner: false,
+                                    isWritable: false,
+                                    pubkey: token.custodyAccount,
+                                });
+                            }
+                            for (_b = 0, custodies_2 = custodies; _b < custodies_2.length; _b++) {
+                                custody = custodies_2[_b];
+                                custodyMetas.push({
+                                    isSigner: false,
+                                    isWritable: false,
+                                    pubkey: custody.intOracleAccount,
+                                });
+                            }
+                            for (_c = 0, _d = POOL_CONFIG.markets; _c < _d.length; _c++) {
+                                market = _d[_c];
+                                marketMetas.push({
+                                    pubkey: market.marketAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            return [4, this.program.methods
+                                    .getLpTokenPrice({})
+                                    .accountsPartial({
+                                    perpetuals: POOL_CONFIG.perpetuals,
+                                    pool: poolKey,
+                                    lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                })
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true) : [])
+                                    .transaction()];
+                        case 1:
+                            transaction = _f.sent();
+                            return [4, backUpOracleInstructionPromise];
+                        case 2:
+                            backUpOracleInstruction = _f.sent();
+                            setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
+                            transaction.instructions.unshift(setCULimitIx);
+                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
+                        case 3:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables)];
+                        case 4:
+                            result = _f.sent();
+                            index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'get_lp_token_price'; });
+                            res = this.viewHelper.decodeLogs(result, index, 'get_lp_token_price');
+                            return [2, res.toString()];
+                    }
+                });
+            });
+        };
+        this.getCompoundingLPTokenPrice = function (poolKey_1, POOL_CONFIG_1) {
+            var args_1 = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([poolKey_1, POOL_CONFIG_1], args_1, true), void 0, function (poolKey, POOL_CONFIG, includeRemainingAccounts) {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_3, token, _b, custodies_4, custody, _c, _d, market, backUpOracleInstruction, transaction, setCULimitIx, addressLookupTables, result, index, res;
+                var _e;
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0:
+                            backUpOracleInstructionPromise = (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true);
+                            custodies = POOL_CONFIG.custodies;
+                            custodyMetas = [];
+                            marketMetas = [];
+                            for (_a = 0, custodies_3 = custodies; _a < custodies_3.length; _a++) {
+                                token = custodies_3[_a];
+                                custodyMetas.push({
+                                    isSigner: false,
+                                    isWritable: false,
+                                    pubkey: token.custodyAccount,
+                                });
+                            }
+                            for (_b = 0, custodies_4 = custodies; _b < custodies_4.length; _b++) {
+                                custody = custodies_4[_b];
+                                custodyMetas.push({
+                                    isSigner: false,
+                                    isWritable: false,
+                                    pubkey: custody.intOracleAccount,
+                                });
+                            }
+                            for (_c = 0, _d = POOL_CONFIG.markets; _c < _d.length; _c++) {
+                                market = _d[_c];
+                                marketMetas.push({
+                                    pubkey: market.marketAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            return [4, backUpOracleInstructionPromise];
+                        case 1:
+                            backUpOracleInstruction = _f.sent();
+                            return [4, this.program.methods
+                                    .getCompoundingTokenPrice({})
+                                    .accounts({
+                                    perpetuals: POOL_CONFIG.perpetuals,
+                                    pool: poolKey,
+                                    lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                })
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true) : [])
+                                    .transaction()];
+                        case 2:
+                            transaction = _f.sent();
+                            setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
+                            transaction.instructions.unshift(setCULimitIx);
+                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
+                        case 3:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables)];
+                        case 4:
+                            result = _f.sent();
+                            index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'get_compounding_token_price'; });
+                            res = this.viewHelper.decodeLogs(result, index, 'get_compounding_token_price');
+                            return [2, res.toString()];
+                    }
+                });
+            });
+        };
         this.getAssetsUnderManagement = function (poolKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_3, token, _a, custodies_4, custody, _b, _c, market;
+            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_5, token, _a, custodies_6, custody, _b, _c, market;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1896,16 +2168,16 @@ var PerpetualsClient = (function () {
                         custodies = POOL_CONFIG.custodies;
                         custodyMetas = [];
                         marketMetas = [];
-                        for (_i = 0, custodies_3 = custodies; _i < custodies_3.length; _i++) {
-                            token = custodies_3[_i];
+                        for (_i = 0, custodies_5 = custodies; _i < custodies_5.length; _i++) {
+                            token = custodies_5[_i];
                             custodyMetas.push({
                                 isSigner: false,
                                 isWritable: false,
                                 pubkey: token.custodyAccount,
                             });
                         }
-                        for (_a = 0, custodies_4 = custodies; _a < custodies_4.length; _a++) {
-                            custody = custodies_4[_a];
+                        for (_a = 0, custodies_6 = custodies; _a < custodies_6.length; _a++) {
+                            custody = custodies_6[_a];
                             custodyMetas.push({
                                 isSigner: false,
                                 isWritable: false,
@@ -1922,7 +2194,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .getAssetsUnderManagement({})
-                                .accounts({
+                                .accountsPartial({
                                 perpetuals: POOL_CONFIG.perpetuals,
                                 pool: poolKey,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -1942,27 +2214,28 @@ var PerpetualsClient = (function () {
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, depositCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle) {
-                var custodies, custodyMetas, marketMetas, _a, custodies_5, token, _b, custodies_6, custody, _c, _d, market, depositCustodyConfig, transaction, setCULimitIx, backUpOracleInstruction, result, index, res;
+            return __awaiter(_this, __spreadArray([amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, depositCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle, whitelist) {
+                var custodies, custodyMetas, marketMetas, _a, custodies_7, token, _b, custodies_8, custody, _c, _d, market, whitelistMeta, depositCustodyConfig, transaction, setCULimitIx, backUpOracleInstruction, addressLookupTables, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
+                if (whitelist === void 0) { whitelist = undefined; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
                             custodies = POOL_CONFIG.custodies;
                             custodyMetas = [];
                             marketMetas = [];
-                            for (_a = 0, custodies_5 = custodies; _a < custodies_5.length; _a++) {
-                                token = custodies_5[_a];
+                            for (_a = 0, custodies_7 = custodies; _a < custodies_7.length; _a++) {
+                                token = custodies_7[_a];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
                                     pubkey: token.custodyAccount,
                                 });
                             }
-                            for (_b = 0, custodies_6 = custodies; _b < custodies_6.length; _b++) {
-                                custody = custodies_6[_b];
+                            for (_b = 0, custodies_8 = custodies; _b < custodies_8.length; _b++) {
+                                custody = custodies_8[_b];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
@@ -1977,12 +2250,17 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
+                            whitelistMeta = {
+                                pubkey: whitelist,
+                                isSigner: false,
+                                isWritable: false,
+                            };
                             depositCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(depositCustodyKey); });
                             return [4, this.program.methods
                                     .getAddLiquidityAmountAndFee({
                                     amountIn: amount,
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     perpetuals: POOL_CONFIG.perpetuals,
                                     pool: poolKey,
                                     custody: depositCustodyKey,
@@ -1990,7 +2268,7 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true), (whitelist ? [whitelistMeta] : []), true))
                                     .transaction()];
                         case 1:
                             transaction = _f.sent();
@@ -2002,8 +2280,11 @@ var PerpetualsClient = (function () {
                             backUpOracleInstruction = _f.sent();
                             (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
                             _f.label = 3;
-                        case 3: return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
+                        case 3: return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
                         case 4:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
+                        case 5:
                             result = _f.sent();
                             if (result.value.err) {
                                 console.error('error Simulation failed:::', result);
@@ -2013,8 +2294,8 @@ var PerpetualsClient = (function () {
                                         error: 'Simulation failed: ' + JSON.stringify(result.value.err),
                                     }];
                             }
-                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddLiquidityAmountAndFee'; });
-                            res = this.viewHelper.decodeLogs(result, index, 'getAddLiquidityAmountAndFee');
+                            index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'get_add_liquidity_amount_and_fee'; });
+                            res = this.viewHelper.decodeLogs(result, index, 'get_add_liquidity_amount_and_fee');
                             return [2, {
                                     amount: res.amount,
                                     fee: res.fee,
@@ -2028,27 +2309,28 @@ var PerpetualsClient = (function () {
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([amount_1, poolKey_1, removeTokenCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle) {
-                var custodies, custodyMetas, marketMetas, _a, custodies_7, token, _b, custodies_8, custody, _c, _d, market, removeCustodyConfig, transaction, setCULimitIx, backUpOracleInstruction, result, index, res;
+            return __awaiter(_this, __spreadArray([amount_1, poolKey_1, removeTokenCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle, whitelist) {
+                var custodies, custodyMetas, marketMetas, _a, custodies_9, token, _b, custodies_10, custody, _c, _d, market, whitelistMeta, removeCustodyConfig, transaction, setCULimitIx, backUpOracleInstruction, addressLookupTables, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
+                if (whitelist === void 0) { whitelist = web3_js_1.PublicKey.default; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
                             custodies = POOL_CONFIG.custodies;
                             custodyMetas = [];
                             marketMetas = [];
-                            for (_a = 0, custodies_7 = custodies; _a < custodies_7.length; _a++) {
-                                token = custodies_7[_a];
+                            for (_a = 0, custodies_9 = custodies; _a < custodies_9.length; _a++) {
+                                token = custodies_9[_a];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
                                     pubkey: token.custodyAccount,
                                 });
                             }
-                            for (_b = 0, custodies_8 = custodies; _b < custodies_8.length; _b++) {
-                                custody = custodies_8[_b];
+                            for (_b = 0, custodies_10 = custodies; _b < custodies_10.length; _b++) {
+                                custody = custodies_10[_b];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
@@ -2063,12 +2345,17 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
+                            whitelistMeta = {
+                                pubkey: whitelist,
+                                isSigner: false,
+                                isWritable: false,
+                            };
                             removeCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(removeTokenCustodyKey); });
                             return [4, this.program.methods
                                     .getRemoveLiquidityAmountAndFee({
                                     lpAmountIn: amount,
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     perpetuals: POOL_CONFIG.perpetuals,
                                     pool: poolKey,
                                     custody: removeTokenCustodyKey,
@@ -2076,7 +2363,7 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true), (whitelist ? [whitelistMeta] : []), true))
                                     .transaction()];
                         case 1:
                             transaction = _f.sent();
@@ -2088,10 +2375,13 @@ var PerpetualsClient = (function () {
                             backUpOracleInstruction = _f.sent();
                             (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
                             _f.label = 3;
-                        case 3: return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
+                        case 3: return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
                         case 4:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
+                        case 5:
                             result = _f.sent();
-                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveLiquidityAmountAndFee'; });
+                            index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'get_remove_liquidity_amount_and_fee'; });
                             if (result.value.err) {
                                 console.error('error Simulation failed:', result);
                                 return [2, {
@@ -2100,7 +2390,7 @@ var PerpetualsClient = (function () {
                                         error: 'Simulation failed: ' + JSON.stringify(result.value.err),
                                     }];
                             }
-                            res = this.viewHelper.decodeLogs(result, index, 'getRemoveLiquidityAmountAndFee');
+                            res = this.viewHelper.decodeLogs(result, index, 'get_remove_liquidity_amount_and_fee');
                             return [2, {
                                     amount: res.amount,
                                     fee: res.fee,
@@ -2109,77 +2399,17 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.getCompoundingLPTokenPrice = function (poolKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_9, token, _a, custodies_10, custody, _b, _c, market, backUpOracleInstruction, transaction, setCULimitIx, result, index, res;
-            var _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        backUpOracleInstructionPromise = (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true);
-                        custodies = POOL_CONFIG.custodies;
-                        custodyMetas = [];
-                        marketMetas = [];
-                        for (_i = 0, custodies_9 = custodies; _i < custodies_9.length; _i++) {
-                            token = custodies_9[_i];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: token.custodyAccount,
-                            });
-                        }
-                        for (_a = 0, custodies_10 = custodies; _a < custodies_10.length; _a++) {
-                            custody = custodies_10[_a];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: custody.intOracleAccount,
-                            });
-                        }
-                        for (_b = 0, _c = POOL_CONFIG.markets; _b < _c.length; _b++) {
-                            market = _c[_b];
-                            marketMetas.push({
-                                pubkey: market.marketAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        return [4, backUpOracleInstructionPromise];
-                    case 1:
-                        backUpOracleInstruction = _e.sent();
-                        return [4, this.program.methods
-                                .getCompoundingTokenPrice({})
-                                .accounts({
-                                perpetuals: POOL_CONFIG.perpetuals,
-                                pool: poolKey,
-                                lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
-                                .transaction()];
-                    case 2:
-                        transaction = _e.sent();
-                        setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
-                        transaction.instructions.unshift(setCULimitIx);
-                        (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
-                        return [4, this.viewHelper.simulateTransaction(transaction)];
-                    case 3:
-                        result = _e.sent();
-                        index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getCompoundingTokenPrice'; });
-                        res = this.viewHelper.decodeLogs(result, index, 'getCompoundingTokenPrice');
-                        return [2, res.toString()];
-                }
-            });
-        }); };
         this.getAddCompoundingLiquidityAmountAndFeeView = function (amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1) {
             var args_1 = [];
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, depositCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle) {
-                var custodies, custodyMetas, marketMetas, _a, custodies_11, token, _b, custodies_12, custody, _c, _d, market, depositCustodyConfig, rewardCustody, transaction, setCULimitIx, backUpOracleInstruction, result, index, res;
+            return __awaiter(_this, __spreadArray([amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, depositCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle, whitelist) {
+                var custodies, custodyMetas, marketMetas, _a, custodies_11, token, _b, custodies_12, custody, _c, _d, market, whitelistMeta, depositCustodyConfig, rewardCustody, transaction, setCULimitIx, addressLookupTables, backUpOracleInstruction, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
+                if (whitelist === void 0) { whitelist = web3_js_1.PublicKey.default; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -2210,13 +2440,18 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
+                            whitelistMeta = {
+                                pubkey: whitelist,
+                                isSigner: false,
+                                isWritable: false,
+                            };
                             depositCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(depositCustodyKey); });
                             rewardCustody = POOL_CONFIG.custodies.find(function (f) { return f.symbol == 'USDC'; });
                             return [4, this.program.methods
                                     .getAddCompoundingLiquidityAmountAndFee({
                                     amountIn: amount,
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     perpetuals: POOL_CONFIG.perpetuals,
                                     pool: poolKey,
                                     inCustody: depositCustodyKey,
@@ -2227,23 +2462,26 @@ var PerpetualsClient = (function () {
                                     compoundingTokenMint: POOL_CONFIG.compoundingTokenMint,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true), (whitelist ? [whitelistMeta] : []), true))
                                     .transaction()];
                         case 1:
                             transaction = _f.sent();
                             setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
                             transaction.instructions.unshift(setCULimitIx);
-                            if (!enableBackupOracle) return [3, 3];
-                            return [4, (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true)];
+                            return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
                         case 2:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            if (!enableBackupOracle) return [3, 4];
+                            return [4, (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true)];
+                        case 3:
                             backUpOracleInstruction = _f.sent();
                             (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
-                            _f.label = 3;
-                        case 3: return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
-                        case 4:
+                            _f.label = 4;
+                        case 4: return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
+                        case 5:
                             result = _f.sent();
-                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddCompoundingLiquidityAmountAndFee'; });
-                            res = this.viewHelper.decodeLogs(result, index, 'getAddCompoundingLiquidityAmountAndFee');
+                            index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'get_add_compounding_liquidity_amount_and_fee'; });
+                            res = this.viewHelper.decodeLogs(result, index, 'get_add_compounding_liquidity_amount_and_fee');
                             return [2, {
                                     amount: res.amount,
                                     fee: res.fee,
@@ -2257,11 +2495,12 @@ var PerpetualsClient = (function () {
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([amount_1, poolKey_1, removeTokenCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle) {
-                var custodies, custodyMetas, marketMetas, _a, custodies_13, token, _b, custodies_14, custody, _c, _d, market, removeCustodyConfig, rewardCustody, transaction, setCULimitIx, backUpOracleInstruction, result, index, res;
+            return __awaiter(_this, __spreadArray([amount_1, poolKey_1, removeTokenCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle, whitelist) {
+                var custodies, custodyMetas, marketMetas, _a, custodies_13, token, _b, custodies_14, custody, _c, _d, market, whitelistMeta, removeCustodyConfig, rewardCustody, transaction, setCULimitIx, backUpOracleInstruction, addressLookupTables, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
+                if (whitelist === void 0) { whitelist = web3_js_1.PublicKey.default; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -2292,13 +2531,18 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
+                            whitelistMeta = {
+                                pubkey: whitelist,
+                                isSigner: false,
+                                isWritable: false,
+                            };
                             removeCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(removeTokenCustodyKey); });
                             rewardCustody = POOL_CONFIG.custodies.find(function (f) { return f.symbol == 'USDC'; });
                             return [4, this.program.methods
                                     .getRemoveCompoundingLiquidityAmountAndFee({
                                     compoundingAmountIn: amount,
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     perpetuals: POOL_CONFIG.perpetuals,
                                     pool: poolKey,
                                     outCustody: removeTokenCustodyKey,
@@ -2309,7 +2553,7 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true), (whitelist ? [whitelistMeta] : []), true))
                                     .transaction()];
                         case 1:
                             transaction = _f.sent();
@@ -2321,17 +2565,20 @@ var PerpetualsClient = (function () {
                             backUpOracleInstruction = _f.sent();
                             (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
                             _f.label = 3;
-                        case 3: return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
+                        case 3: return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
                         case 4:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
+                        case 5:
                             result = _f.sent();
-                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveCompoundingLiquidityAmountAndFee'; });
+                            index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'get_remove_compounding_liquidity_amount_and_fee'; });
                             if (result.value.err) {
                                 return [2, {
                                         amount: new anchor_1.BN(0),
                                         fee: new anchor_1.BN(0),
                                     }];
                             }
-                            res = this.viewHelper.decodeLogs(result, index, 'getRemoveCompoundingLiquidityAmountAndFee');
+                            res = this.viewHelper.decodeLogs(result, index, 'get_remove_compounding_liquidity_amount_and_fee');
                             return [2, {
                                     amount: res.amount,
                                     fee: res.fee,
@@ -2357,7 +2604,7 @@ var PerpetualsClient = (function () {
                         collateralCustodyConfig = poolConfig.custodies.find(function (f) { return f.custodyAccount.equals(marketConfig_1.collateralCustody); });
                         return [4, this.program.methods
                                 .getLiquidationPrice({})
-                                .accounts({
+                                .accountsPartial({
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
                                 position: positionAccountKey,
@@ -2391,7 +2638,7 @@ var PerpetualsClient = (function () {
                         collateralCustodyConfig = poolConfig.custodies.find(function (f) { return f.mintKey.equals(collateralMint); });
                         return [4, this.program.methods
                                 .getLiquidationState({})
-                                .accounts({
+                                .accountsPartial({
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
                                 position: positionAccount,
@@ -2441,54 +2688,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .getCompoundingTokenData({})
-                                .accounts({
-                                perpetuals: this.perpetuals.publicKey,
-                                pool: poolConfig.poolAddress,
-                                lpTokenMint: poolConfig.stakedLpTokenMint,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
-                                .view()
-                                .catch(function (err) {
-                                console.error(err);
-                                throw err;
-                            })];
-                    case 1: return [2, _d.sent()];
-                }
-            });
-        }); };
-        this.getLpTokenPriceView = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        custodyAccountMetas = [];
-                        custodyOracleAccountMetas = [];
-                        markets = [];
-                        for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
-                            custody = _a[_i];
-                            custodyAccountMetas.push({
-                                pubkey: custody.custodyAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                            custodyOracleAccountMetas.push({
-                                pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        for (_b = 0, _c = poolConfig.markets; _b < _c.length; _b++) {
-                            market = _c[_b];
-                            markets.push({
-                                pubkey: market.marketAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        return [4, this.program.methods
-                                .getLpTokenPrice({})
-                                .accounts({
+                                .accountsPartial({
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
                                 lpTokenMint: poolConfig.stakedLpTokenMint,
@@ -2584,7 +2784,7 @@ var PerpetualsClient = (function () {
                             };
                             return [4, this.program.methods
                                     .openPosition(params)
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     fundingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userCollateralTokenAccount,
@@ -2599,8 +2799,6 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     transferAuthority: this.authority.publicKey,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: collateralCustodyConfig.mintKey
@@ -2685,7 +2883,7 @@ var PerpetualsClient = (function () {
                                     priceWithSlippage: priceWithSlippage,
                                     privilege: privilege
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     feePayer: publicKey,
                                     owner: publicKey,
                                     receivingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
@@ -2700,7 +2898,6 @@ var PerpetualsClient = (function () {
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
@@ -2837,7 +3034,7 @@ var PerpetualsClient = (function () {
                                     sizeAmount: sizeAmount,
                                     privilege: privilege
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     fundingAccount: userInputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
@@ -2856,7 +3053,6 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: userInputCustodyConfig.mintKey,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(userInputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
@@ -2963,7 +3159,7 @@ var PerpetualsClient = (function () {
                                     priceWithSlippage: priceWithSlippage,
                                     privilege: privilege
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     receivingAccount: userOutputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
@@ -2981,8 +3177,6 @@ var PerpetualsClient = (function () {
                                     dispensingCustody: userOutputCustodyConfig.custodyAccount,
                                     dispensingOracleAccount: this.useExtOracleAccount ? userOutputCustodyConfig.extOracleAccount : userOutputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: userOutputCustodyConfig.mintKey,
                                     receivingTokenProgram: userOutputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
@@ -3080,7 +3274,7 @@ var PerpetualsClient = (function () {
                             _c.label = 6;
                         case 6: return [4, this.program.methods.addCollateral({
                                 collateralDelta: collateralWithFee
-                            }).accounts({
+                            }).accountsPartial({
                                 owner: publicKey,
                                 position: positionPubKey,
                                 market: marketAccount,
@@ -3092,9 +3286,7 @@ var PerpetualsClient = (function () {
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
                                 fundingTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 fundingMint: collateralCustodyConfig.mintKey
                             })
@@ -3194,7 +3386,7 @@ var PerpetualsClient = (function () {
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.program.methods.swapAndAddCollateral({
                                     amountIn: amountIn,
-                                }).accounts({
+                                }).accountsPartial({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     fundingAccount: inputSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
@@ -3211,9 +3403,7 @@ var PerpetualsClient = (function () {
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    eventAuthority: this.eventAuthority.publicKey,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(inputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: poolConfig.getTokenFromSymbol(inputSymbol).mintKey,
                                 })
@@ -3300,7 +3490,7 @@ var PerpetualsClient = (function () {
                                     .removeCollateral({
                                     collateralDeltaUsd: collateralDeltaUsd,
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     receivingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -3315,7 +3505,6 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     receivingTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: collateralCustodyConfig.mintKey
                                 })
@@ -3404,7 +3593,7 @@ var PerpetualsClient = (function () {
                                     .removeCollateralAndSwap({
                                     collateralDeltaUsd: collateralDeltaUsd,
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     receivingAccount: outputSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
@@ -3422,8 +3611,6 @@ var PerpetualsClient = (function () {
                                     dispensingCustody: outputCustodyConfig.custodyAccount,
                                     dispensingOracleAccount: this.useExtOracleAccount ? outputCustodyConfig.extOracleAccount : outputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: outputCustodyConfig.mintKey,
                                     receivingTokenProgram: poolConfig.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
@@ -3475,7 +3662,7 @@ var PerpetualsClient = (function () {
                                     sizeDelta: sizeDelta,
                                     privilege: privilege
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
@@ -3489,7 +3676,6 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey
                                 })
@@ -3539,7 +3725,7 @@ var PerpetualsClient = (function () {
                                     sizeDelta: sizeDelta,
                                     privilege: privilege
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
@@ -3553,7 +3739,6 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey
                                 })
@@ -3575,10 +3760,12 @@ var PerpetualsClient = (function () {
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([payTokenSymbol_1, tokenAmountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (payTokenSymbol, tokenAmountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, payToken, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, tokenAccountBalance, _f, instruction, err_5;
+            return __awaiter(_this, __spreadArray([payTokenSymbol_1, tokenAmountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (payTokenSymbol, tokenAmountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, isWhitelistedUser, includeRemainingAccounts) {
+                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, payToken, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, tokenAccountBalance, _f, whitelistPda, whitelistMeta, instruction, err_5;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+                if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
@@ -3672,31 +3859,37 @@ var PerpetualsClient = (function () {
                                 throw "Insufficient Funds need more ".concat(tokenAmountIn.sub(tokenAccountBalance), " tokens");
                             }
                             _g.label = 8;
-                        case 8: return [4, this.program.methods
-                                .addLiquidity({
-                                amountIn: tokenAmountIn,
-                                minLpAmountOut: minLpAmountOut
-                            })
-                                .accounts({
-                                owner: publicKey,
-                                fundingAccount: payTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userPayingTokenAccount,
-                                lpTokenAccount: lpTokenAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                custody: payTokenCustodyConfig.custodyAccount,
-                                custodyOracleAccount: this.useExtOracleAccount ? payTokenCustodyConfig.extOracleAccount : payTokenCustodyConfig.intOracleAccount,
-                                custodyTokenAccount: payTokenCustodyConfig.tokenAccount,
-                                lpTokenMint: poolConfig.stakedLpTokenMint,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                program: this.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                fundingMint: payTokenCustodyConfig.mintKey,
-                                fundingTokenProgram: payToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
-                                .instruction()];
+                        case 8:
+                            whitelistPda = this.findProgramAddress("whitelist", [publicKey]).publicKey;
+                            whitelistMeta = {
+                                pubkey: whitelistPda,
+                                isSigner: false,
+                                isWritable: false,
+                            };
+                            return [4, this.program.methods
+                                    .addLiquidity({
+                                    amountIn: tokenAmountIn,
+                                    minLpAmountOut: minLpAmountOut
+                                })
+                                    .accountsPartial({
+                                    owner: publicKey,
+                                    fundingAccount: payTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userPayingTokenAccount,
+                                    lpTokenAccount: lpTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    custody: payTokenCustodyConfig.custodyAccount,
+                                    custodyOracleAccount: this.useExtOracleAccount ? payTokenCustodyConfig.extOracleAccount : payTokenCustodyConfig.intOracleAccount,
+                                    custodyTokenAccount: payTokenCustodyConfig.tokenAccount,
+                                    lpTokenMint: poolConfig.stakedLpTokenMint,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    fundingMint: payTokenCustodyConfig.mintKey,
+                                    fundingTokenProgram: payToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                })
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true) : __spreadArray([], (isWhitelistedUser ? [whitelistMeta] : []), true))
+                                    .instruction()];
                         case 9:
                             instruction = _g.sent();
                             instructions.push(instruction);
@@ -3718,11 +3911,13 @@ var PerpetualsClient = (function () {
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([inputSymbol_1, amountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (inputSymbol, amountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
-                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, inputToken, flpStakeAccount, poolStakedLpVault, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, instruction;
+            return __awaiter(_this, __spreadArray([inputSymbol_1, amountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (inputSymbol, amountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey, isWhitelistedUser, includeRemainingAccounts) {
+                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, inputToken, flpStakeAccount, poolStakedLpVault, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, whitelistPda, whitelistMeta, instruction;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
+                if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
@@ -3814,10 +4009,16 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
+                            whitelistPda = this.findProgramAddress("whitelist", [publicKey]).publicKey;
+                            whitelistMeta = {
+                                pubkey: whitelistPda,
+                                isSigner: false,
+                                isWritable: false,
+                            };
                             return [4, this.program.methods.addLiquidityAndStake({
                                     amountIn: amountIn,
                                     minLpAmountOut: minLpAmountOut,
-                                }).accounts({
+                                }).accountsPartial({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     fundingAccount: inputSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
@@ -3832,13 +4033,11 @@ var PerpetualsClient = (function () {
                                     poolStakedLpVault: poolStakedLpVault,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: inputCustodyConfig.mintKey,
-                                    fundingTokenProgram: inputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
+                                    fundingTokenProgram: inputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true) : __spreadArray([], (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
                         case 8:
                             instruction = _g.sent();
@@ -3856,13 +4055,15 @@ var PerpetualsClient = (function () {
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([recieveTokenSymbol_1, liquidityAmountIn_1, minTokenAmountOut_1, poolConfig_1], args_1, true), void 0, function (recieveTokenSymbol, liquidityAmountIn, minTokenAmountOut, poolConfig, closeLpATA, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey, userPublicKey) {
-                var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, recieveToken, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, _e, removeLiquidityTx, closeInx, closeWsolATAIns, err_6;
+            return __awaiter(_this, __spreadArray([recieveTokenSymbol_1, liquidityAmountIn_1, minTokenAmountOut_1, poolConfig_1], args_1, true), void 0, function (recieveTokenSymbol, liquidityAmountIn, minTokenAmountOut, poolConfig, closeLpATA, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey, userPublicKey, isWhitelistedUser, includeRemainingAccounts) {
+                var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, recieveToken, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, _e, whitelistPda, whitelistMeta, removeLiquidityTx, closeInx, closeWsolATAIns, err_6;
                 if (closeLpATA === void 0) { closeLpATA = false; }
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
+                if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -3937,31 +4138,37 @@ var PerpetualsClient = (function () {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, recieveToken.mintKey, recieveToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             _f.label = 5;
-                        case 5: return [4, this.program.methods
-                                .removeLiquidity({
-                                lpAmountIn: liquidityAmountIn,
-                                minAmountOut: minTokenAmountOut
-                            })
-                                .accounts({
-                                owner: publicKey,
-                                receivingAccount: recieveTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
-                                lpTokenAccount: stakedLpTokenAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                custody: recieveTokenCustodyConfig.custodyAccount,
-                                custodyOracleAccount: this.useExtOracleAccount ? recieveTokenCustodyConfig.extOracleAccount : recieveTokenCustodyConfig.intOracleAccount,
-                                custodyTokenAccount: recieveTokenCustodyConfig.tokenAccount,
-                                lpTokenMint: poolConfig.stakedLpTokenMint,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                program: this.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                receivingMint: recieveTokenCustodyConfig.mintKey,
-                                receivingTokenProgram: recieveToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
-                                .instruction()];
+                        case 5:
+                            whitelistPda = this.findProgramAddress("whitelist", [publicKey]).publicKey;
+                            whitelistMeta = {
+                                pubkey: whitelistPda,
+                                isSigner: false,
+                                isWritable: false,
+                            };
+                            return [4, this.program.methods
+                                    .removeLiquidity({
+                                    lpAmountIn: liquidityAmountIn,
+                                    minAmountOut: minTokenAmountOut
+                                })
+                                    .accountsPartial({
+                                    owner: publicKey,
+                                    receivingAccount: recieveTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
+                                    lpTokenAccount: stakedLpTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    custody: recieveTokenCustodyConfig.custodyAccount,
+                                    custodyOracleAccount: this.useExtOracleAccount ? recieveTokenCustodyConfig.extOracleAccount : recieveTokenCustodyConfig.intOracleAccount,
+                                    custodyTokenAccount: recieveTokenCustodyConfig.tokenAccount,
+                                    lpTokenMint: poolConfig.stakedLpTokenMint,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    receivingMint: recieveTokenCustodyConfig.mintKey,
+                                    receivingTokenProgram: recieveToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                })
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true) : __spreadArray([], (isWhitelistedUser ? [whitelistMeta] : []), true))
+                                    .instruction()];
                         case 6:
                             removeLiquidityTx = _f.sent();
                             instructions.push(removeLiquidityTx);
@@ -4001,7 +4208,7 @@ var PerpetualsClient = (function () {
                         _a.trys.push([1, 3, , 4]);
                         return [4, this.program.methods
                                 .createReferral({})
-                                .accounts({
+                                .accountsPartial({
                                 owner: publicKey,
                                 feePayer: publicKey,
                                 referralAccount: nftReferralAccount,
@@ -4046,7 +4253,7 @@ var PerpetualsClient = (function () {
                                 .depositStake({
                                 depositAmount: depositAmount
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: owner,
                                 feePayer: feePayer,
                                 fundingLpTokenAccount: userLpTokenAccount,
@@ -4057,8 +4264,6 @@ var PerpetualsClient = (function () {
                                 poolStakedLpVault: poolStakedLpVault,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                                 lpTokenMint: poolConfig.stakedLpTokenMint,
                             })
                                 .instruction()];
@@ -4111,12 +4316,11 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .refreshStake({})
-                                .accounts({
+                                .accountsPartial({
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: pool,
                                 rewardCustody: rewardCustodyConfig.custodyAccount,
                                 feeDistributionTokenAccount: feeDistributionTokenAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), flpStakeAccountMetas, true))
@@ -4172,12 +4376,11 @@ var PerpetualsClient = (function () {
                             });
                             return [4, this.program.methods
                                     .refreshStake({})
-                                    .accounts({
+                                    .accountsPartial({
                                     perpetuals: this.perpetuals.publicKey,
                                     pool: pool,
                                     rewardCustody: rewardCustodyConfig.custodyAccount,
                                     feeDistributionTokenAccount: feeDistributionTokenAccount,
-                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), stakeAccountMetas, true))
@@ -4236,13 +4439,12 @@ var PerpetualsClient = (function () {
                                     .unstakeInstant({
                                     unstakeAmount: unstakeAmount
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     perpetuals: this.perpetuals.publicKey,
                                     pool: pool,
                                     flpStakeAccount: flpStakeAccount,
                                     rewardCustody: rewardCustodyConfig.custodyAccount,
-                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                 })
                                     .remainingAccounts(__spreadArray([], tokenStakeAccounts, true))
@@ -4297,7 +4499,7 @@ var PerpetualsClient = (function () {
                                 .setFeeShare({
                                 feeShareBps: new anchor_1.BN(7000)
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 pool: pool,
@@ -4334,14 +4536,13 @@ var PerpetualsClient = (function () {
                                 .unstakeRequest({
                                 unstakeAmount: unstakeAmount
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: publicKey,
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: pool,
                                 flpStakeAccount: flpStakeAccount,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId
                             })
                                 .instruction()];
@@ -4402,7 +4603,7 @@ var PerpetualsClient = (function () {
                                     pendingActivation: pendingActivation,
                                     deactivated: deactivated
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     receivingLpTokenAccount: userLpTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -4412,7 +4613,6 @@ var PerpetualsClient = (function () {
                                     poolStakedLpVault: poolStakedLpVault,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                     lpMint: poolConfig.stakedLpTokenMint,
                                 })
@@ -4477,7 +4677,7 @@ var PerpetualsClient = (function () {
                             }
                             return [4, this.program.methods
                                     .collectStakeFees({})
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     receivingTokenAccount: receivingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -4489,7 +4689,6 @@ var PerpetualsClient = (function () {
                                     program: this.program.programId,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: rewardCustodyMint,
                                 })
@@ -4516,13 +4715,14 @@ var PerpetualsClient = (function () {
             for (var _i = 5; _i < arguments.length; _i++) {
                 args_1[_i - 5] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([amountIn_1, minCompoundingAmountOut_1, inTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey, enableHeapSizeIx, enableDebugLogs) {
-                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, heapSizeIx, addCompoundingLiquidity, err_16;
+            return __awaiter(_this, __spreadArray([amountIn_1, minCompoundingAmountOut_1, inTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey, enableHeapSizeIx, isWhitelistedUser, includeRemainingAccounts) {
+                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, heapSizeIx, whitelistPda, whitelistMeta, addCompoundingLiquidity, err_16;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableHeapSizeIx === void 0) { enableHeapSizeIx = true; }
-                if (enableDebugLogs === void 0) { enableDebugLogs = false; }
+                if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -4617,17 +4817,20 @@ var PerpetualsClient = (function () {
                                 heapSizeIx = web3_js_1.ComputeBudgetProgram.requestHeapFrame({
                                     bytes: 64 * 1024,
                                 });
-                                if (enableDebugLogs) {
-                                    console.log("SDK: adding 64 liq Data heapSizeIx for addCompoundingLiquidity");
-                                }
                                 preInstructions.push(heapSizeIx);
                             }
+                            whitelistPda = this.findProgramAddress("whitelist", [publicKey]).publicKey;
+                            whitelistMeta = {
+                                pubkey: whitelistPda,
+                                isSigner: false,
+                                isWritable: false,
+                            };
                             return [4, this.program.methods
                                     .addCompoundingLiquidity({
                                     amountIn: amountIn,
                                     minCompoundingAmountOut: minCompoundingAmountOut
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     fundingAccount: inTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : fundingAccount,
                                     compoundingTokenAccount: compoundingTokenAccount,
@@ -4643,13 +4846,12 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: lpTokenMint,
                                     compoundingTokenMint: compoundingTokenMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: inCustodyConfig.mintKey,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(inTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true) : __spreadArray([], (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
                         case 8:
                             addCompoundingLiquidity = _f.sent();
@@ -4672,13 +4874,14 @@ var PerpetualsClient = (function () {
             for (var _i = 5; _i < arguments.length; _i++) {
                 args_1[_i - 5] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([compoundingAmountIn_1, minAmountOut_1, outTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (compoundingAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA, ephemeralSignerPubkey, userPublicKey, enableHeapSizeIx, enableDebugLogs) {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, compoundingTokenAccount, heapSizeIx, removeCompoundingLiquidity, err_17;
+            return __awaiter(_this, __spreadArray([compoundingAmountIn_1, minAmountOut_1, outTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (compoundingAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA, ephemeralSignerPubkey, userPublicKey, enableHeapSizeIx, isWhitelistedUser, includeRemainingAccounts) {
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, compoundingTokenAccount, heapSizeIx, whitelistPda, whitelistMeta, removeCompoundingLiquidity, err_17;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableHeapSizeIx === void 0) { enableHeapSizeIx = true; }
-                if (enableDebugLogs === void 0) { enableDebugLogs = false; }
+                if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -4757,17 +4960,20 @@ var PerpetualsClient = (function () {
                                 heapSizeIx = web3_js_1.ComputeBudgetProgram.requestHeapFrame({
                                     bytes: 64 * 1024,
                                 });
-                                if (enableDebugLogs) {
-                                    console.log("SDK: adding 64 liq Data heapSizeIx for addCompoundingLiquidity");
-                                }
                                 preInstructions.push(heapSizeIx);
                             }
+                            whitelistPda = this.findProgramAddress("whitelist", [publicKey]).publicKey;
+                            whitelistMeta = {
+                                pubkey: whitelistPda,
+                                isSigner: false,
+                                isWritable: false,
+                            };
                             return [4, this.program.methods
                                     .removeCompoundingLiquidity({
                                     compoundingAmountIn: compoundingAmountIn,
                                     minAmountOut: minAmountOut
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     receivingAccount: outCustodyConfig.symbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
                                     compoundingTokenAccount: compoundingTokenAccount,
@@ -4783,13 +4989,12 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: lpTokenMint,
                                     compoundingTokenMint: compoundingTokenMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: outCustodyConfig.mintKey,
-                                    receivingTokenProgram: poolConfig.getTokenFromSymbol(outTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
+                                    receivingTokenProgram: poolConfig.getTokenFromSymbol(outTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true) : __spreadArray([], (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
                         case 6:
                             removeCompoundingLiquidity = _f.sent();
@@ -4886,7 +5091,7 @@ var PerpetualsClient = (function () {
                                     .migrateStake({
                                     amount: amount
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     compoundingTokenAccount: compoudingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -4900,7 +5105,6 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: lpTokenMint,
                                     compoundingTokenMint: compoundingTokenMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
@@ -4969,7 +5173,7 @@ var PerpetualsClient = (function () {
                                 .migrateFlp({
                                 compoundingTokenAmount: amount
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: publicKey,
                                 compoundingTokenAccount: compoudingTokenAccount,
                                 transferAuthority: poolConfig.transferAuthority,
@@ -4984,7 +5188,6 @@ var PerpetualsClient = (function () {
                                 compoundingTokenMint: compoundingTokenMint,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
@@ -5049,7 +5252,7 @@ var PerpetualsClient = (function () {
                             _e.trys.push([1, 3, , 4]);
                             return [4, this.program.methods
                                     .compoundFees({})
-                                    .accounts({
+                                    .accountsPartial({
                                     poolCompoundingLpVault: poolConfig.compoundingLpVault,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
@@ -5058,7 +5261,6 @@ var PerpetualsClient = (function () {
                                     rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
                                     lpTokenMint: lpTokenMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
@@ -5103,7 +5305,7 @@ var PerpetualsClient = (function () {
                                 .depositTokenStake({
                                 depositAmount: depositAmount
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: owner,
                                 feePayer: feePayer,
                                 fundingTokenAccount: userTokenAccount,
@@ -5113,8 +5315,6 @@ var PerpetualsClient = (function () {
                                 tokenStakeAccount: tokenStakeAccount,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
@@ -5150,11 +5350,10 @@ var PerpetualsClient = (function () {
                                 .unstakeTokenRequest({
                                 unstakeAmount: unstakeAmount
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: owner,
                                 tokenVault: poolConfig.tokenVault,
                                 tokenStakeAccount: tokenStakeAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId
                             })
                                 .instruction()];
@@ -5196,7 +5395,7 @@ var PerpetualsClient = (function () {
                                 .unstakeTokenInstant({
                                 unstakeAmount: unstakeAmount
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: owner,
                                 receivingTokenAccount: userTokenAccount,
                                 perpetuals: poolConfig.perpetuals,
@@ -5205,8 +5404,6 @@ var PerpetualsClient = (function () {
                                 tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
                                 tokenStakeAccount: tokenStakeAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
@@ -5248,7 +5445,7 @@ var PerpetualsClient = (function () {
                                 .withdrawToken({
                                 withdrawRequestId: withdrawRequestId
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: owner,
                                 receivingTokenAccount: userTokenAccount,
                                 perpetuals: this.perpetuals.publicKey,
@@ -5257,8 +5454,6 @@ var PerpetualsClient = (function () {
                                 tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
                                 tokenStakeAccount: tokenStakeAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
@@ -5294,11 +5489,10 @@ var PerpetualsClient = (function () {
                                 .cancelUnstakeTokenRequest({
                                 withdrawRequestId: withdrawRequestId
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: owner,
                                 tokenVault: poolConfig.tokenVault,
                                 tokenStakeAccount: tokenStakeAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId
                             })
                                 .instruction()];
@@ -5350,7 +5544,7 @@ var PerpetualsClient = (function () {
                             }
                             return [4, this.program.methods
                                     .collectTokenReward({})
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: owner,
                                     receivingTokenAccount: userTokenAccount,
                                     perpetuals: this.perpetuals.publicKey,
@@ -5359,8 +5553,6 @@ var PerpetualsClient = (function () {
                                     tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
                                     tokenStakeAccount: tokenStakeAccount,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     tokenMint: poolConfig.tokenMint,
                                 })
                                     .instruction()];
@@ -5414,7 +5606,7 @@ var PerpetualsClient = (function () {
                             }
                             return [4, this.program.methods
                                     .collectRevenue({})
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: owner,
                                     receivingRevenueAccount: userTokenAccount,
                                     perpetuals: this.perpetuals.publicKey,
@@ -5423,8 +5615,6 @@ var PerpetualsClient = (function () {
                                     revenueTokenAccount: poolConfig.revenueTokenAccount,
                                     tokenStakeAccount: tokenStakeAccount,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     receivingTokenMint: rewardCustodyMint,
                                 })
                                     .instruction()];
@@ -5478,7 +5668,7 @@ var PerpetualsClient = (function () {
                             }
                             return [4, this.program.methods
                                     .collectRebate()
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: owner,
                                     receivingTokenAccount: userTokenAccount,
                                     perpetuals: this.perpetuals.publicKey,
@@ -5487,8 +5677,6 @@ var PerpetualsClient = (function () {
                                     rebateTokenAccount: poolConfig.rebateTokenAccount,
                                     tokenStakeAccount: tokenStakeAccount,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     receivingTokenMint: rebateMint,
                                 })
                                     .instruction()];
@@ -5524,7 +5712,7 @@ var PerpetualsClient = (function () {
                         rebateMint = poolConfig.getTokenFromSymbol(rebateSymbol).mintKey;
                         return [4, this.program.methods
                                 .settleRebates()
-                                .accounts({
+                                .accountsPartial({
                                 transferAuthority: poolConfig.transferAuthority,
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
@@ -5535,8 +5723,6 @@ var PerpetualsClient = (function () {
                                 rebateTokenAccount: poolConfig.rebateTokenAccount,
                                 tokenMint: rebateMint,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .instruction()];
@@ -5639,7 +5825,7 @@ var PerpetualsClient = (function () {
                                     stopLossPrice: stopLossPrice,
                                     takeProfitPrice: takeProfitPrice
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     fundingAccount: reserveSymbol == 'SOL' ? wrappedSolAccount.publicKey : userReserveTokenAccount,
@@ -5656,8 +5842,6 @@ var PerpetualsClient = (function () {
                                     receiveCustody: receiveCustodyConfig.custodyAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: reserveCustodyConfig.mintKey,
                                 })
@@ -5747,7 +5931,7 @@ var PerpetualsClient = (function () {
                                     stopLossPrice: stopLossPrice,
                                     takeProfitPrice: takeProfitPrice
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     receivingAccount: reserveSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
@@ -5764,8 +5948,6 @@ var PerpetualsClient = (function () {
                                     reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
                                     receiveCustody: receiveCustodyConfig.custodyAccount,
                                     receivingTokenProgram: poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: poolConfig.getTokenFromSymbol(reserveSymbol).mintKey
                                 })
@@ -5816,7 +5998,7 @@ var PerpetualsClient = (function () {
                                     orderId: orderId,
                                     privilege: privilege
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     positionOwner: userPubkey,
                                     feePayer: publicKey,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -5832,8 +6014,6 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey,
                                 })
@@ -5886,7 +6066,7 @@ var PerpetualsClient = (function () {
                                     orderId: orderId,
                                     privilege: privilege
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     positionOwner: userPubkey,
                                     feePayer: publicKey,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -5904,8 +6084,6 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey,
                                 })
@@ -5952,7 +6130,7 @@ var PerpetualsClient = (function () {
                                 deltaSizeAmount: deltaSizeAmount,
                                 isStopLoss: isStopLoss
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: publicKey,
                                 feePayer: publicKey,
                                 perpetuals: poolConfig.perpetuals,
@@ -5966,8 +6144,6 @@ var PerpetualsClient = (function () {
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 receiveCustody: receivingCustodyConfig.custodyAccount,
                                 systemProgram: web3_js_1.SystemProgram.programId,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .instruction()];
@@ -6012,7 +6188,7 @@ var PerpetualsClient = (function () {
                                 deltaSizeAmount: deltaSizeAmount,
                                 isStopLoss: isStopLoss
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: publicKey,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
@@ -6024,8 +6200,6 @@ var PerpetualsClient = (function () {
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 receiveCustody: receivingCustodyConfig.custodyAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .instruction()];
@@ -6066,11 +6240,9 @@ var PerpetualsClient = (function () {
                                 orderId: orderId,
                                 isStopLoss: isStopLoss
                             })
-                                .accounts({
+                                .accountsPartial({
                                 owner: publicKey,
                                 order: orderAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                             })
                                 .instruction()];
                     case 2:
@@ -6108,11 +6280,9 @@ var PerpetualsClient = (function () {
                         positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                         return [4, this.program.methods
                                 .cancelAllTriggerOrders()
-                                .accounts({
+                                .accountsPartial({
                                 position: positionAccount,
                                 order: orderAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                             })
                                 .instruction()];
                     case 2:
@@ -6208,7 +6378,7 @@ var PerpetualsClient = (function () {
                                     orderId: orderId,
                                     privilege: privilege
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     positionOwner: owner,
                                     feePayer: payerPubkey,
                                     receivingAccount: userReceivingTokenAccount,
@@ -6227,8 +6397,6 @@ var PerpetualsClient = (function () {
                                     dispensingCustody: receivingCustodyConfig.custodyAccount,
                                     dispensingOracleAccount: this.useExtOracleAccount ? receivingCustodyConfig.extOracleAccount : receivingCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: receivingCustodyConfig.tokenAccount,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: receivingCustodyConfig.mintKey,
                                     receivingTokenProgram: receivingToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
@@ -6302,7 +6470,7 @@ var PerpetualsClient = (function () {
                                     orderId: orderId,
                                     privilege: privilege
                                 })
-                                    .accounts({
+                                    .accountsPartial({
                                     feePayer: payerPubkey,
                                     positionOwner: owner,
                                     receivingAccount: userReceivingTokenAccount,
@@ -6318,8 +6486,6 @@ var PerpetualsClient = (function () {
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     receivingTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: collateralCustodyConfig.mintKey
                                 })
@@ -6346,13 +6512,14 @@ var PerpetualsClient = (function () {
             for (var _i = 5; _i < arguments.length; _i++) {
                 args_1[_i - 5] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1], args_1, true), void 0, function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks, ephemeralSignerPubkey) {
-                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _e, _f, custody, params, inx, closeWsolATAIns, err_40;
+            return __awaiter(_this, __spreadArray([userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1], args_1, true), void 0, function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks, ephemeralSignerPubkey, isWhitelistedUser) {
+                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _e, _f, custody, whitelistPda, whitelistMeta, params, inx, closeWsolATAIns, err_40;
                 if (useFeesPool === void 0) { useFeesPool = false; }
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (unWrapSol === void 0) { unWrapSol = false; }
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+                if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
@@ -6513,6 +6680,12 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
+                            whitelistPda = this.findProgramAddress("whitelist", [publicKey]).publicKey;
+                            whitelistMeta = {
+                                pubkey: whitelistPda,
+                                isSigner: false,
+                                isWritable: false,
+                            };
                             params = {
                                 amountIn: amountIn,
                                 minAmountOut: minAmountOut,
@@ -6520,7 +6693,7 @@ var PerpetualsClient = (function () {
                             };
                             return [4, this.program.methods
                                     .swap(params)
-                                    .accounts({
+                                    .accountsPartial({
                                     owner: publicKey,
                                     fundingAccount: userInputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
                                     receivingAccount: userOutputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userOutputTokenAccount,
@@ -6534,14 +6707,13 @@ var PerpetualsClient = (function () {
                                     dispensingCustodyOracleAccount: this.useExtOracleAccount ? userOutputCustodyConfig.extOracleAccount : userOutputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: userInputCustodyConfig.mintKey,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(userInputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     receivingMint: userOutputCustodyConfig.mintKey,
                                     receivingTokenProgram: poolConfig.getTokenFromSymbol(userOutputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
                         case 18:
                             inx = _g.sent();
@@ -6602,15 +6774,13 @@ var PerpetualsClient = (function () {
                         params = {};
                         return [4, this.program.methods
                                 .swapFeeInternal(params)
-                                .accounts({
+                                .accountsPartial({
                                 owner: publicKey,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
                                 rewardCustody: rewardCustody.custodyAccount,
                                 rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
                                 rewardCustodyTokenAccount: rewardCustody.tokenAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
@@ -6666,7 +6836,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .setLpTokenPrice({})
-                                .accounts({
+                                .accountsPartial({
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
                                 lpTokenMint: poolConfig.stakedLpTokenMint,
@@ -6706,7 +6876,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .init(config)
-                                .accounts({
+                                .accountsPartial({
                                 upgradeAuthority: this.provider.wallet.publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
@@ -6749,7 +6919,7 @@ var PerpetualsClient = (function () {
                                 .setAdminSigners({
                                 minSignatures: minSignatures,
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: this.admin,
                                 multisig: this.multisig.publicKey,
                             })
@@ -6786,7 +6956,7 @@ var PerpetualsClient = (function () {
                             maxLpPriceUsd: maxLpPriceUsd,
                             thresholdUsd: thresholdUsd
                         })
-                            .accounts({
+                            .accountsPartial({
                             admin: this.provider.wallet.publicKey,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
@@ -6813,7 +6983,7 @@ var PerpetualsClient = (function () {
                 switch (_a.label) {
                     case 0: return [4, this.program.methods
                             .removePool({})
-                            .accounts({
+                            .accountsPartial({
                             admin: this.admin,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
@@ -6832,7 +7002,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCustody = function (poolName, tokenMint, isToken222, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment, rewardThreshold, minReserveUsd, limitPriceBufferBps) { return __awaiter(_this, void 0, void 0, function () {
+        this.addCustody = function (poolName, tokenMint, isToken222, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment, rewardThreshold, minReserveUsd, limitPriceBufferBps, inversePrice) { return __awaiter(_this, void 0, void 0, function () {
             var trx_id, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -6843,6 +7013,7 @@ var PerpetualsClient = (function () {
                                 isStable: isStable,
                                 depegAdjustment: depegAdjustment,
                                 isVirtual: isVirtual,
+                                inversePrice: inversePrice,
                                 token22: isToken222,
                                 oracle: oracle,
                                 pricing: pricing,
@@ -6854,7 +7025,7 @@ var PerpetualsClient = (function () {
                                 minReserveUsd: minReserveUsd,
                                 limitPriceBufferBps: limitPriceBufferBps
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: this.admin,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
@@ -6898,7 +7069,7 @@ var PerpetualsClient = (function () {
                             borrowRate: borrowRate,
                             ratios: ratios,
                         })
-                            .accounts({
+                            .accountsPartial({
                             admin: this.admin,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
@@ -6932,7 +7103,7 @@ var PerpetualsClient = (function () {
                         userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMint, this.admin, true);
                         return [4, this.program.methods
                                 .removeCustody({ ratios: ratios })
-                                .accounts({
+                                .accountsPartial({
                                 admin: this.admin,
                                 receivingAccount: userReceivingTokenAccount,
                                 multisig: this.multisig.publicKey,
@@ -6975,7 +7146,7 @@ var PerpetualsClient = (function () {
                         _a.trys.push([2, 4, , 5]);
                         return [4, this.program.methods
                                 .withdrawFees({})
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
@@ -7003,12 +7174,12 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.moveProtocolFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_45;
+            var publicKey, rewardCustodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_45;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
-                        custodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
+                        rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
                         instructions = [];
                         additionalSigners = [];
                         _a.label = 1;
@@ -7016,20 +7187,19 @@ var PerpetualsClient = (function () {
                         _a.trys.push([1, 3, , 4]);
                         return [4, this.program.methods
                                 .moveProtocolFees()
-                                .accounts({
+                                .accountsPartial({
                                 transferAuthority: this.authority.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
                                 tokenVault: poolConfig.tokenVault,
                                 pool: poolConfig.poolAddress,
-                                custody: custodyConfig.custodyAccount,
-                                custodyTokenAccount: custodyConfig.tokenAccount,
+                                rewardCustody: rewardCustodyConfig.custodyAccount,
+                                rewardCustodyTokenAccount: rewardCustodyConfig.tokenAccount,
                                 revenueTokenAccount: poolConfig.revenueTokenAccount,
                                 protocolVault: poolConfig.protocolVault,
                                 protocolTokenAccount: poolConfig.protocolTokenAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
-                                tokenMint: custodyConfig.mintKey,
+                                tokenMint: rewardCustodyConfig.mintKey,
                             })
                                 .instruction()];
                     case 2:
@@ -7058,7 +7228,7 @@ var PerpetualsClient = (function () {
                                 .setProtocolFeeShare({
                                 feeShareBps: feeShareBps
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 protocolVault: poolConfig.protocolVault,
@@ -7092,7 +7262,7 @@ var PerpetualsClient = (function () {
                                 .setPermissions({
                                 permissions: permissions,
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey
@@ -7151,7 +7321,7 @@ var PerpetualsClient = (function () {
                         _g.trys.push([1, 4, , 5]);
                         _e = (_d = this.program.methods
                             .reimburse({ amountIn: amountIn }))
-                            .accounts;
+                            .accountsPartial;
                         _f = {
                             admin: this.provider.wallet.publicKey,
                             multisig: poolConfig.multisig
@@ -7205,7 +7375,7 @@ var PerpetualsClient = (function () {
                                 ema: ema,
                                 publishTime: publishTime,
                             })
-                                .accounts({
+                                .accountsPartial({
                                 authority: poolConfig.backupOracle,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
@@ -7267,7 +7437,7 @@ var PerpetualsClient = (function () {
                                 useCurrentTime: useCurrentTime,
                                 prices: tokenInternalPrices
                             })
-                                .accounts({
+                                .accountsPartial({
                                 authority: POOL_CONFIGS[0].backupOracle,
                             })
                                 .remainingAccounts(__spreadArray([], accountMetas, true))
@@ -7318,7 +7488,7 @@ var PerpetualsClient = (function () {
                                 .setInternalEmaPrice({
                                 prices: tokenInternalEmaPrices
                             })
-                                .accounts({
+                                .accountsPartial({
                                 authority: POOL_CONFIGS[0].backupOracle,
                             })
                                 .remainingAccounts(__spreadArray([], accountMetas, true))
@@ -7338,8 +7508,43 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
+        this.setPositionPriceImpact = function (positionPubkey, priceImpactUsd, penaltyAuthority) { return __awaiter(_this, void 0, void 0, function () {
+            var instructions, additionalSigners, setPositionPriceImpactIx, err_52;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        instructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .setPositionPriceImpact({
+                                priceImpactUsd: priceImpactUsd,
+                            })
+                                .accountsPartial({
+                                authority: penaltyAuthority,
+                                position: positionPubkey,
+                                program: this.program.programId,
+                            })
+                                .instruction()];
+                    case 2:
+                        setPositionPriceImpactIx = _a.sent();
+                        instructions.push(setPositionPriceImpactIx);
+                        return [3, 4];
+                    case 3:
+                        err_52 = _a.sent();
+                        console.log("perpClient setPositionPriceImpact error:: ", err_52);
+                        throw err_52;
+                    case 4: return [2, {
+                            instructions: __spreadArray([], instructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
         this.renameFlp = function (flag, lpTokenName, lpTokenSymbol, lpTokenUri, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_52;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_53;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7358,7 +7563,7 @@ var PerpetualsClient = (function () {
                                 lpTokenSymbol: lpTokenSymbol,
                                 lpTokenUri: lpTokenUri,
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: poolConfig.transferAuthority,
@@ -7377,8 +7582,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_52 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_52);
+                        err_53 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_53);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -7388,7 +7593,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initStake = function (stakingFeeShareBps, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_53;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_54;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7407,7 +7612,7 @@ var PerpetualsClient = (function () {
                                 .initStaking({
                                 stakingFeeShareBps: stakingFeeShareBps
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: poolConfig.transferAuthority,
@@ -7426,9 +7631,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_53 = _a.sent();
-                        console.log("perpClient InitStaking error:: ", err_53);
-                        throw err_53;
+                        err_54 = _a.sent();
+                        console.log("perpClient InitStaking error:: ", err_54);
+                        throw err_54;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7437,7 +7642,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initCompounding = function (feeShareBps, metadataTitle, metadataSymbol, metadataUri, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_54;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_55;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7460,7 +7665,7 @@ var PerpetualsClient = (function () {
                                 metadataSymbol: metadataSymbol,
                                 metadataUri: metadataUri
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: poolConfig.transferAuthority,
@@ -7481,10 +7686,10 @@ var PerpetualsClient = (function () {
                         instructions.push(initCompoundingInstruction);
                         return [3, 4];
                     case 3:
-                        err_54 = _a.sent();
-                        console.log("perpClient initCompounding error:: ", err_54);
-                        throw err_54;
-                    case 4: return [2, {
+                        err_55 = _a.sent();
+                        console.log("perpClient initCompounding error:: ", err_55);
+                        throw err_55;
+                    case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -7492,7 +7697,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initTokenVault = function (token_permissions, tokens_to_distribute, withdrawTimeLimit, withdrawInstantFee, stakeLevel, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_55;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_56;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7514,7 +7719,7 @@ var PerpetualsClient = (function () {
                                 withdrawInstantFee: withdrawInstantFee,
                                 stakeLevel: stakeLevel,
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -7533,9 +7738,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initTokenVaultInstruction);
                         return [3, 4];
                     case 3:
-                        err_55 = _a.sent();
-                        console.log("perpClient InitTokenVaultInstruction error:: ", err_55);
-                        throw err_55;
+                        err_56 = _a.sent();
+                        console.log("perpClient InitTokenVaultInstruction error:: ", err_56);
+                        throw err_56;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7544,7 +7749,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenVaultConfig = function (token_permissions, withdrawTimeLimit, withdrawInstantFee, stakeLevel, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_56;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_57;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7563,7 +7768,7 @@ var PerpetualsClient = (function () {
                                 withdrawInstantFee: withdrawInstantFee,
                                 stakeLevel: stakeLevel,
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 tokenVault: poolConfig.tokenVault,
@@ -7575,9 +7780,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenVaultConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_56 = _a.sent();
-                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_56);
-                        throw err_56;
+                        err_57 = _a.sent();
+                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_57);
+                        throw err_57;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7586,7 +7791,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawInstantFee = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_57;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_58;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7608,7 +7813,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .withdrawInstantFees({})
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -7625,9 +7830,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawInstantFeeInstruction);
                         return [3, 6];
                     case 5:
-                        err_57 = _a.sent();
-                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_57);
-                        throw err_57;
+                        err_58 = _a.sent();
+                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_58);
+                        throw err_58;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7636,7 +7841,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawUnclaimedTokens = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawUnclaimedTokensInstruction, err_58;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawUnclaimedTokensInstruction, err_59;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7658,7 +7863,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .withdrawUnclaimedTokens({})
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -7675,9 +7880,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawUnclaimedTokensInstruction);
                         return [3, 6];
                     case 5:
-                        err_58 = _a.sent();
-                        console.log("perpClient withdrawUnclaimedTokensInstruction error:: ", err_58);
-                        throw err_58;
+                        err_59 = _a.sent();
+                        console.log("perpClient withdrawUnclaimedTokensInstruction error:: ", err_59);
+                        throw err_59;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7686,7 +7891,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRevenueTokenAccount = function (feeShareBps, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_59;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_60;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7703,7 +7908,7 @@ var PerpetualsClient = (function () {
                                 .initRevenueTokenAccount({
                                 feeShareBps: feeShareBps
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -7723,9 +7928,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRevenueTokenAccountInstruction);
                         return [3, 4];
                     case 3:
-                        err_59 = _a.sent();
-                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_59);
-                        throw err_59;
+                        err_60 = _a.sent();
+                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_60);
+                        throw err_60;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7734,7 +7939,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRebateVault = function (allowRebatePayout, rebateSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateCustodyMint, initRebateVaultInstruction, err_60;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateCustodyMint, initRebateVaultInstruction, err_61;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7751,7 +7956,7 @@ var PerpetualsClient = (function () {
                                 .initRebateVault({
                                 allowRebatePayout: allowRebatePayout
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: poolConfig.transferAuthority,
@@ -7769,9 +7974,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRebateVaultInstruction);
                         return [3, 4];
                     case 3:
-                        err_60 = _a.sent();
-                        console.log("perpClient initRebateVaultInstruction error:: ", err_60);
-                        throw err_60;
+                        err_61 = _a.sent();
+                        console.log("perpClient initRebateVaultInstruction error:: ", err_61);
+                        throw err_61;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7780,7 +7985,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.distributeTokenReward = function (amount, epochCount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_61;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_62;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7800,7 +8005,7 @@ var PerpetualsClient = (function () {
                                 amount: amount,
                                 epochCount: epochCount,
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -7809,8 +8014,6 @@ var PerpetualsClient = (function () {
                                 tokenVault: poolConfig.tokenVault,
                                 tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
@@ -7819,9 +8022,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_61 = _a.sent();
-                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_61);
-                        throw err_61;
+                        err_62 = _a.sent();
+                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_62);
+                        throw err_62;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7829,8 +8032,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.setTokenStakeLevel = function (owner, stakeLevel) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_62;
+        this.setTokenStakeLevel = function (owner, stakeLevel, isInitialized) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_63;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7846,8 +8049,9 @@ var PerpetualsClient = (function () {
                         return [4, this.program.methods
                                 .setTokenStakeLevel({
                                 level: stakeLevel,
+                                init: isInitialized,
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 tokenStakeAccount: tokenStakeAccount,
@@ -7858,9 +8062,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenStakeLevelInstruction);
                         return [3, 4];
                     case 3:
-                        err_62 = _a.sent();
-                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_62);
-                        throw err_62;
+                        err_63 = _a.sent();
+                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_63);
+                        throw err_63;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7869,7 +8073,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenReward = function (owner, amount, epochCount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_63;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_64;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7887,12 +8091,11 @@ var PerpetualsClient = (function () {
                                 amount: amount,
                                 epochCount: epochCount,
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 tokenVault: poolConfig.tokenVault,
                                 tokenStakeAccount: tokenStakeAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId
                             })
                                 .instruction()];
@@ -7901,9 +8104,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_63 = _a.sent();
-                        console.log("perpClient setTokenRewardInstruction error:: ", err_63);
-                        throw err_63;
+                        err_64 = _a.sent();
+                        console.log("perpClient setTokenRewardInstruction error:: ", err_64);
+                        throw err_64;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7912,7 +8115,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.resizeInternalOracle = function (extOracle, tokenMint, intOracleAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, resizeInternalOracleInstruction, err_64;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, resizeInternalOracleInstruction, err_65;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7928,7 +8131,7 @@ var PerpetualsClient = (function () {
                                 .resizeInternalOracle({
                                 extOracle: extOracle
                             })
-                                .accounts({
+                                .accountsPartial({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 custodyTokenMint: tokenMint,
@@ -7941,9 +8144,457 @@ var PerpetualsClient = (function () {
                         instructions.push(resizeInternalOracleInstruction);
                         return [3, 4];
                     case 3:
-                        err_64 = _a.sent();
-                        console.log("perpClient resizeInternalOracleInstruction error:: ", err_64);
-                        throw err_64;
+                        err_65 = _a.sent();
+                        console.log("perpClient resizeInternalOracleInstruction error:: ", err_65);
+                        throw err_65;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.createWhitelist = function (isSwapFeeExempt, isDepositFeeExempt, isWithdrawalFeeExempt, poolAddress, owner) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, whitelist, createWhitelistInstruction, err_66;
+            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]);
+                        whitelist = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("whitelist"), owner.toBuffer()], this.programId)[0];
+                        return [4, this.program.methods
+                                .createWhitelist({
+                                isSwapFeeExempt: isSwapFeeExempt,
+                                isDepositFeeExempt: isDepositFeeExempt,
+                                isWithdrawalFeeExempt: isWithdrawalFeeExempt,
+                                poolAddress: poolAddress,
+                            })
+                                .accountsPartial({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                owner: owner,
+                                whitelist: whitelist,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                            })
+                                .instruction()];
+                    case 2:
+                        createWhitelistInstruction = _a.sent();
+                        instructions.push(createWhitelistInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_66 = _a.sent();
+                        console.log("perpClient createWhitelistInstruction error:: ", err_66);
+                        throw err_66;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setWhitelistConfig = function (isSwapFeeExempt, isDepositFeeExempt, isWithdrawalFeeExempt, poolAddress, owner) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, whitelist, setWhitelistConfigInstruction, err_67;
+            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]);
+                        whitelist = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("whitelist"), owner.toBuffer()], this.programId)[0];
+                        return [4, this.program.methods
+                                .setWhitelistConfig({
+                                isSwapFeeExempt: isSwapFeeExempt,
+                                isDepositFeeExempt: isDepositFeeExempt,
+                                isWithdrawalFeeExempt: isWithdrawalFeeExempt,
+                                poolAddress: poolAddress
+                            })
+                                .accountsPartial({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                owner: owner,
+                                whitelist: whitelist,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                            })
+                                .instruction()];
+                    case 2:
+                        setWhitelistConfigInstruction = _a.sent();
+                        instructions.push(setWhitelistConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_67 = _a.sent();
+                        console.log("perpClient setWhitelistConfigInstruction error:: ", err_67);
+                        throw err_67;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setPerpetualsConfig = function (allowUngatedTrading, voltageMultiplier, tradingDiscount, referralRebate, defaultRebate, tradeLimit, triggerOrderLimit, rebateLimitUsd) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPerpetualsConfigInstruction, err_68;
+            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
+                                .setPerpetualsConfig({
+                                allowUngatedTrading: allowUngatedTrading,
+                                tradingDiscount: tradingDiscount,
+                                referralRebate: referralRebate,
+                                defaultRebate: defaultRebate,
+                                voltageMultiplier: voltageMultiplier,
+                                tradeLimit: tradeLimit,
+                                triggerOrderLimit: triggerOrderLimit,
+                                rebateLimitUsd: rebateLimitUsd,
+                            })
+                                .accountsPartial({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                            })
+                                .instruction()];
+                    case 2:
+                        setPerpetualsConfigInstruction = _a.sent();
+                        instructions.push(setPerpetualsConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_68 = _a.sent();
+                        console.log("perpClient setPerpetualsConfigInstruction error:: ", err_68);
+                        throw err_68;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setPoolConfig = function (name, permissions, maxAumUsd, oracleAuthority, stakingFeeShareBps, vpVolumeFactor, stakingFeeBoostBps, minLpPriceUsd, maxLpPriceUsd, thresholdUsd) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPoolConfigInstruction, err_69;
+            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]);
+                        console.log(vpVolumeFactor);
+                        return [4, this.program.methods
+                                .setPoolConfig({ permissions: permissions, oracleAuthority: oracleAuthority, maxAumUsd: maxAumUsd, stakingFeeShareBps: stakingFeeShareBps, vpVolumeFactor: vpVolumeFactor, stakingFeeBoostBps: stakingFeeBoostBps, minLpPriceUsd: minLpPriceUsd, maxLpPriceUsd: maxLpPriceUsd, thresholdUsd: thresholdUsd
+                            })
+                                .accountsPartial({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                pool: this.getPoolKey(name),
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                            })
+                                .instruction()];
+                    case 2:
+                        setPoolConfigInstruction = _a.sent();
+                        instructions.push(setPoolConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_69 = _a.sent();
+                        console.log("perpClient setPoolConfigInstruction error:: ", err_69);
+                        throw err_69;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.addCustodyToken22 = function (poolName, tokenMint, tokenAccountSpace, token22) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addCustodyToken22Instruction, err_70;
+            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
+                                .addCustodyToken22Account({
+                                tokenAccountSpace: tokenAccountSpace
+                            })
+                                .accountsPartial({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: this.authority.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                custodyTokenAccount: this.getCustodyTokenAccountKey(poolName, tokenMint),
+                                custodyTokenMint: tokenMint,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: token22 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                            })
+                                .instruction()];
+                    case 2:
+                        addCustodyToken22Instruction = _a.sent();
+                        instructions.push(addCustodyToken22Instruction);
+                        return [3, 4];
+                    case 3:
+                        err_70 = _a.sent();
+                        console.log("perpClient addCustodyToken22Instruction error:: ", err_70);
+                        throw err_70;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.addMarket = function (poolName, targetCustody, collateralCustody, side, correlation, maxPayoffBps, permissions) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, market, addMarketInstruction, err_71;
+            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]);
+                        market = web3_js_1.PublicKey.findProgramAddressSync([
+                            Buffer.from("market"),
+                            targetCustody.toBuffer(),
+                            collateralCustody.toBuffer(),
+                            (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
+                        ], this.program.programId)[0];
+                        return [4, this.program.methods
+                                .addMarket({
+                                side: side === "long" ? { long: {} } : { short: {} },
+                                correlation: correlation,
+                                maxPayoffBps: maxPayoffBps,
+                                permissions: permissions
+                            })
+                                .accountsPartial({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: this.authority.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                market: market,
+                                targetCustody: targetCustody,
+                                collateralCustody: collateralCustody,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        addMarketInstruction = _a.sent();
+                        instructions.push(addMarketInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_71 = _a.sent();
+                        console.log("perpClient addMarketInstruction error:: ", err_71);
+                        throw err_71;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setCustody = function (poolName, tokenMint, depegAdjustment, inversePrice, oracle, pricingConfig, permissions, fees, borrowRate, ratios, rewardThreshold, minReserveUsd, limitPriceBufferBps, token22) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setCustodyConfigInstruction, err_72;
+            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
+                                .setCustodyConfig({
+                                depegAdjustment: depegAdjustment,
+                                inversePrice: inversePrice,
+                                oracle: oracle,
+                                pricing: pricingConfig,
+                                permissions: permissions,
+                                fees: fees,
+                                borrowRate: borrowRate,
+                                ratios: ratios,
+                                rewardThreshold: rewardThreshold,
+                                minReserveUsd: minReserveUsd,
+                                limitPriceBufferBps: limitPriceBufferBps,
+                                token22: token22
+                            })
+                                .accountsPartial({
+                                admin: this.admin,
+                                multisig: this.multisig.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                custody: this.getCustodyKey(poolName, tokenMint),
+                            })
+                                .instruction()];
+                    case 2:
+                        setCustodyConfigInstruction = _a.sent();
+                        instructions.push(setCustodyConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_72 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_72);
+                        throw err_72;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.addInternalOracle = function (exponent, tokenMint, intOracleAccount, extOracleAccount) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addInternalOracleInstruction, err_73;
+            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
+                                .addInternalOracle({
+                                expo: exponent,
+                                extOracle: extOracleAccount,
+                            })
+                                .accountsPartial({
+                                admin: this.admin,
+                                multisig: this.multisig.publicKey,
+                                custodyTokenMint: tokenMint,
+                                intOracleAccount: intOracleAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        addInternalOracleInstruction = _a.sent();
+                        instructions.push(addInternalOracleInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_73 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_73);
+                        throw err_73;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setMarket = function (poolName, targetCustody, collateralCustody, marketAccount, maxPayoffBps, permissions, correlation) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setMarketConfigInstruction, err_74;
+            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
+                                .setMarketConfig({
+                                maxPayoffBps: maxPayoffBps,
+                                permissions: permissions,
+                                correlation: correlation
+                            })
+                                .accountsPartial({
+                                admin: this.admin,
+                                multisig: this.multisig.publicKey,
+                                market: marketAccount,
+                                targetCustody: targetCustody,
+                                collateralCustody: collateralCustody
+                            })
+                                .instruction()];
+                    case 2:
+                        setMarketConfigInstruction = _a.sent();
+                        instructions.push(setMarketConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_74 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_74);
+                        throw err_74;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.removeMarket = function (poolName, market, targetMint, collateralMint) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, removeMarketInstruction, err_75;
+            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
+                                .removeMarket({})
+                                .accountsPartial({
+                                admin: this.admin,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: this.authority.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                market: market,
+                                targetCustody: this.getCustodyKey(poolName, targetMint),
+                                collateralCustody: this.getCustodyKey(poolName, collateralMint),
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                            })
+                                .instruction()];
+                    case 2:
+                        removeMarketInstruction = _a.sent();
+                        instructions.push(removeMarketInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_75 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_75);
+                        throw err_75;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7953,18 +8604,14 @@ var PerpetualsClient = (function () {
         }); };
         this.provider = provider;
         (0, anchor_1.setProvider)(provider);
-        this.program = new anchor_1.Program(perpetuals_1.IDL, programId);
-        this.programPerpComposability = new anchor_1.Program(perp_composability_1.IDL, composabilityProgramId);
-        this.programFbnftReward = new anchor_1.Program(fbnft_rewards_1.IDL, fbNftRewardProgramId);
-        this.programRewardDistribution = new anchor_1.Program(reward_distribution_1.IDL, rewardDistributionProgramId);
+        var idlWithAddress = __assign(__assign({}, perpetuals_json_1.default), { address: programId.toBase58() });
+        this.program = new anchor_1.Program(idlWithAddress, provider);
         this.programId = programId;
-        this.composabilityProgramId = composabilityProgramId;
         this.admin = this.provider.wallet.publicKey;
         this.multisig = this.findProgramAddress("multisig");
         this.authority = this.findProgramAddress("transfer_authority");
         this.perpetuals = this.findProgramAddress("perpetuals");
         this.eventAuthority = this.findProgramAddress("__event_authority");
-        this.eventAuthorityRewardDistribution = this.findProgramAddressFromProgramId("__event_authority", null, this.programRewardDistribution.programId);
         this.minimumBalanceForRentExemptAccountLamports = 2039280;
         this.prioritizationFee = (opts === null || opts === void 0 ? void 0 : opts.prioritizationFee) || 0;
         this.useExtOracleAccount = useExtOracleAccount;
@@ -7979,7 +8626,7 @@ var PerpetualsClient = (function () {
         return this.findProgramAddress("market", [
             targetCustody,
             collateralCustody,
-            side === 'long' ? [1] : [2],
+            (0, types_1.isVariant)(side, 'long') ? [1] : [2],
         ]).publicKey;
     };
     PerpetualsClient.prototype.getPositionKey = function (owner, targetCustody, collateralCustody, side) {