flash-sdk 2.50.1 → 2.50.2

package/dist/PerpetualsClient.js

@@ -2148,40 +2148,36 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.getAddLiquidityAmountAndFeeView = 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) {
-                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_5, token, _b, custodies_6, custody, _c, _d, market, depositCustodyConfig, transaction, backUpOracleInstruction, result, index, res;
-                var _e;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+        this.getAddLiquidityAmountAndFeeView = function (amount, poolKey, depositCustodyKey, POOL_CONFIG, userPublicKey) {
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_5, token, _a, custodies_6, custody, _b, _c, market, depositCustodyConfig, transaction, backUpOracleInstruction, 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 (_a = 0, custodies_5 = custodies; _a < custodies_5.length; _a++) {
-                                token = custodies_5[_a];
+                            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 (_b = 0, custodies_6 = custodies; _b < custodies_6.length; _b++) {
-                                custody = custodies_6[_b];
+                            for (_a = 0, custodies_6 = custodies; _a < custodies_6.length; _a++) {
+                                custody = custodies_6[_a];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
                                     pubkey: custody.intOracleAccount,
                                 });
                             }
-                            for (_c = 0, _d = POOL_CONFIG.markets; _c < _d.length; _c++) {
-                                market = _d[_c];
+                            for (_b = 0, _c = POOL_CONFIG.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
                                 marketMetas.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
@@ -2204,14 +2200,14 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
                                     .transaction()];
                         case 1:
-                            transaction = _f.sent();
+                            transaction = _e.sent();
                             return [4, backUpOracleInstructionPromise];
                         case 2:
-                            backUpOracleInstruction = _f.sent();
-                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            backUpOracleInstruction = _e.sent();
+                            (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
                             return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
                         case 3:
-                            result = _f.sent();
+                            result = _e.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddLiquidityAmountAndFee'; });
                             res = this.viewHelper.decodeLogs(result, index, 'getAddLiquidityAmountAndFee');
                             return [2, {
@@ -2222,40 +2218,36 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.getRemoveLiquidityAmountAndFeeView = function (amount_1, poolKey_1, removeTokenCustodyKey_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, removeTokenCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey) {
-                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_7, token, _b, custodies_8, custody, _c, _d, market, removeCustodyConfig, transaction, backUpOracleInstruction, result, index, res;
-                var _e;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+        this.getRemoveLiquidityAmountAndFeeView = function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey) {
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_7, token, _a, custodies_8, custody, _b, _c, market, removeCustodyConfig, transaction, backUpOracleInstruction, 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 (_a = 0, custodies_7 = custodies; _a < custodies_7.length; _a++) {
-                                token = custodies_7[_a];
+                            for (_i = 0, custodies_7 = custodies; _i < custodies_7.length; _i++) {
+                                token = custodies_7[_i];
                                 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 (_a = 0, custodies_8 = custodies; _a < custodies_8.length; _a++) {
+                                custody = custodies_8[_a];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
                                     pubkey: custody.intOracleAccount,
                                 });
                             }
-                            for (_c = 0, _d = POOL_CONFIG.markets; _c < _d.length; _c++) {
-                                market = _d[_c];
+                            for (_b = 0, _c = POOL_CONFIG.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
                                 marketMetas.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
@@ -2278,14 +2270,14 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
                                     .transaction()];
                         case 1:
-                            transaction = _f.sent();
+                            transaction = _e.sent();
                             return [4, backUpOracleInstructionPromise];
                         case 2:
-                            backUpOracleInstruction = _f.sent();
-                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            backUpOracleInstruction = _e.sent();
+                            (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
                             return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
                         case 3:
-                            result = _f.sent();
+                            result = _e.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveLiquidityAmountAndFee'; });
                             if (result.value.err) {
                                 return [2, {
@@ -2361,40 +2353,36 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        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) {
-                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_11, token, _b, custodies_12, custody, _c, _d, market, depositCustodyConfig, rewardCustody, backUpOracleInstruction, transaction, result, index, res;
-                var _e;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+        this.getAddCompoundingLiquidityAmountAndFeeView = function (amount, poolKey, depositCustodyKey, POOL_CONFIG, userPublicKey) {
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_11, token, _a, custodies_12, custody, _b, _c, market, depositCustodyConfig, rewardCustody, backUpOracleInstruction, transaction, 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 (_a = 0, custodies_11 = custodies; _a < custodies_11.length; _a++) {
-                                token = custodies_11[_a];
+                            for (_i = 0, custodies_11 = custodies; _i < custodies_11.length; _i++) {
+                                token = custodies_11[_i];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
                                     pubkey: token.custodyAccount,
                                 });
                             }
-                            for (_b = 0, custodies_12 = custodies; _b < custodies_12.length; _b++) {
-                                custody = custodies_12[_b];
+                            for (_a = 0, custodies_12 = custodies; _a < custodies_12.length; _a++) {
+                                custody = custodies_12[_a];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
                                     pubkey: custody.intOracleAccount,
                                 });
                             }
-                            for (_c = 0, _d = POOL_CONFIG.markets; _c < _d.length; _c++) {
-                                market = _d[_c];
+                            for (_b = 0, _c = POOL_CONFIG.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
                                 marketMetas.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
@@ -2405,7 +2393,7 @@ var PerpetualsClient = (function () {
                             rewardCustody = POOL_CONFIG.custodies.find(function (f) { return f.symbol == 'USDC'; });
                             return [4, backUpOracleInstructionPromise];
                         case 1:
-                            backUpOracleInstruction = _f.sent();
+                            backUpOracleInstruction = _e.sent();
                             return [4, this.program.methods
                                     .getAddCompoundingLiquidityAmountAndFee({
                                     amountIn: amount,
@@ -2424,11 +2412,11 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
                                     .transaction()];
                         case 2:
-                            transaction = _f.sent();
-                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            transaction = _e.sent();
+                            (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
                             return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
                         case 3:
-                            result = _f.sent();
+                            result = _e.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddCompoundingLiquidityAmountAndFee'; });
                             res = this.viewHelper.decodeLogs(result, index, 'getAddCompoundingLiquidityAmountAndFee');
                             return [2, {
@@ -2439,40 +2427,36 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.getRemoveCompoundingLiquidityAmountAndFeeView = function (amount_1, poolKey_1, removeTokenCustodyKey_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, removeTokenCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey) {
-                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_13, token, _b, custodies_14, custody, _c, _d, market, removeCustodyConfig, rewardCustody, backUpOracleInstruction, transaction, result, index, res;
-                var _e;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+        this.getRemoveCompoundingLiquidityAmountAndFeeView = function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey) {
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_13, token, _a, custodies_14, custody, _b, _c, market, removeCustodyConfig, rewardCustody, backUpOracleInstruction, transaction, 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 (_a = 0, custodies_13 = custodies; _a < custodies_13.length; _a++) {
-                                token = custodies_13[_a];
+                            for (_i = 0, custodies_13 = custodies; _i < custodies_13.length; _i++) {
+                                token = custodies_13[_i];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
                                     pubkey: token.custodyAccount,
                                 });
                             }
-                            for (_b = 0, custodies_14 = custodies; _b < custodies_14.length; _b++) {
-                                custody = custodies_14[_b];
+                            for (_a = 0, custodies_14 = custodies; _a < custodies_14.length; _a++) {
+                                custody = custodies_14[_a];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
                                     pubkey: custody.intOracleAccount,
                                 });
                             }
-                            for (_c = 0, _d = POOL_CONFIG.markets; _c < _d.length; _c++) {
-                                market = _d[_c];
+                            for (_b = 0, _c = POOL_CONFIG.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
                                 marketMetas.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
@@ -2483,7 +2467,7 @@ var PerpetualsClient = (function () {
                             rewardCustody = POOL_CONFIG.custodies.find(function (f) { return f.symbol == 'USDC'; });
                             return [4, backUpOracleInstructionPromise];
                         case 1:
-                            backUpOracleInstruction = _f.sent();
+                            backUpOracleInstruction = _e.sent();
                             return [4, this.program.methods
                                     .getRemoveCompoundingLiquidityAmountAndFee({
                                     compoundingAmountIn: amount,
@@ -2502,11 +2486,11 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
                                     .transaction()];
                         case 2:
-                            transaction = _f.sent();
-                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            transaction = _e.sent();
+                            (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
                             return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
                         case 3:
-                            result = _f.sent();
+                            result = _e.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveCompoundingLiquidityAmountAndFee'; });
                             if (result.value.err) {
                                 return [2, {
@@ -2523,6 +2507,47 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.getLiquidationPriceView = function (positionAccountKey, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var positionAccount_1, marketConfig_1, targetCustodyConfig, collateralCustodyConfig, err_2;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4, this.getPosition(positionAccountKey)];
+                    case 1:
+                        positionAccount_1 = _a.sent();
+                        marketConfig_1 = poolConfig.markets.find(function (m) { return m.marketAccount.equals(positionAccount_1.market); });
+                        if (!marketConfig_1) {
+                            throw new Error("Market config not found for position account: ".concat(positionAccountKey.toBase58()));
+                        }
+                        targetCustodyConfig = poolConfig.custodies.find(function (f) { return f.custodyAccount.equals(marketConfig_1.targetCustody); });
+                        collateralCustodyConfig = poolConfig.custodies.find(function (f) { return f.custodyAccount.equals(marketConfig_1.collateralCustody); });
+                        return [4, this.program.methods
+                                .getLiquidationPrice({})
+                                .accounts({
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: poolConfig.poolAddress,
+                                position: positionAccountKey,
+                                targetCustody: targetCustodyConfig.custodyAccount,
+                                targetOracleAccount: targetCustodyConfig.intOracleAccount,
+                                collateralCustody: collateralCustodyConfig.custodyAccount,
+                                collateralOracleAccount: collateralCustodyConfig.intOracleAccount,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                            })
+                                .view()
+                                .catch(function (err) {
+                                console.error(err);
+                                throw err;
+                            })];
+                    case 2: return [2, _a.sent()];
+                    case 3:
+                        err_2 = _a.sent();
+                        console.error("Error in getLiquidationPriceView:", err_2);
+                        throw err_2;
+                    case 4: return [2];
+                }
+            });
+        }); };
         this.getLiquidationStateView = function (positionAccount, poolName, tokenMint, collateralMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var targetCustodyConfig, collateralCustodyConfig;
             return __generator(this, function (_a) {
@@ -2645,18 +2670,14 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.openPosition = function (targetSymbol_1, collateralSymbol_1, priceWithSlippage_1, collateralWithfee_1, size_1, side_1, poolConfig_1, privilege_1) {
-            var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, priceWithSlippage_1, collateralWithfee_1, size_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, priceWithSlippage, collateralWithfee, size, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
+        this.openPosition = function (targetSymbol, collateralSymbol, priceWithSlippage, collateralWithfee, size, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
                 var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userCollateralTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, params, instruction;
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
-                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -2760,19 +2781,15 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.closePosition = function (marketSymbol_1, collateralSymbol_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1) {
-            var args_1 = [];
-            for (var _i = 6; _i < arguments.length; _i++) {
-                args_1[_i - 6] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([marketSymbol_1, collateralSymbol_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (marketSymbol, collateralSymbol, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+        this.closePosition = function (marketSymbol, collateralSymbol, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            if (createUserATA === void 0) { createUserATA = true; }
+            if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
                 var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, instruction, closeWsolATAIns, error_2;
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -2869,18 +2886,14 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.swapAndOpen = function (targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, minCollateralAmountOut_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1) {
-            var args_1 = [];
-            for (var _i = 10; _i < arguments.length; _i++) {
-                args_1[_i - 10] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, minCollateralAmountOut_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, minCollateralAmountOut, priceWithSlippage, sizeAmount, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, userInputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, userOutputTokenAccount, tokenAccountBalance, _b, userOutputTokenAccount, inx, err_2;
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
-                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+        this.swapAndOpen = function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, minCollateralAmountOut, priceWithSlippage, sizeAmount, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, userInputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, userOutputTokenAccount, tokenAccountBalance, _b, userOutputTokenAccount, inx, err_3;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -3009,9 +3022,9 @@ var PerpetualsClient = (function () {
                             instructions.push(inx);
                             return [3, 13];
                         case 12:
-                            err_2 = _c.sent();
-                            console.error("perpClient SwapAndOpen error:: ", err_2);
-                            throw err_2;
+                            err_3 = _c.sent();
+                            console.error("perpClient SwapAndOpen error:: ", err_3);
+                            throw err_3;
                         case 13: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -3020,17 +3033,13 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.closeAndSwap = function (targetTokenSymbol_1, userOutputTokenSymbol_1, collateralTokenSymbol_1, minSwapAmountOut_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1) {
-            var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, userOutputTokenSymbol_1, collateralTokenSymbol_1, minSwapAmountOut_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, userOutputTokenSymbol, collateralTokenSymbol, minSwapAmountOut, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, ephemeralSignerPubkey) {
-                var publicKey, userOutputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, inx, err_3;
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+        this.closeAndSwap = function (targetTokenSymbol, userOutputTokenSymbol, collateralTokenSymbol, minSwapAmountOut, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, ephemeralSignerPubkey) {
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, userOutputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, inx, err_4;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -3133,9 +3142,9 @@ var PerpetualsClient = (function () {
                             instructions.push(inx);
                             return [3, 9];
                         case 8:
-                            err_3 = _a.sent();
-                            console.error("perpClient CloseAndSwap error:: ", err_3);
-                            throw err_3;
+                            err_4 = _a.sent();
+                            console.error("perpClient CloseAndSwap error:: ", err_4);
+                            throw err_4;
                         case 9: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -3144,20 +3153,16 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.swap = function (userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1) {
-            var args_1 = [];
-            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_4;
-                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; }
-                return __generator(this, function (_g) {
-                    switch (_g.label) {
+        this.swap = function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks, ephemeralSignerPubkey) {
+            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; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _i, _e, custody, params, inx, closeWsolATAIns, err_5;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             userInputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey); });
                             if (!userInputCustodyConfig) {
@@ -3175,10 +3180,10 @@ var PerpetualsClient = (function () {
                             if (!(userInputTokenSymbol == 'SOL' && userOutputTokenSymbol == 'WSOL')) return [3, 5];
                             return [4, (0, spl_token_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, publicKey, true)];
                         case 1:
-                            wsolAssociatedTokenAccount = _g.sent();
+                            wsolAssociatedTokenAccount = _f.sent();
                             return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
                         case 2:
-                            wsolATAExist = _g.sent();
+                            wsolATAExist = _f.sent();
                             if (!wsolATAExist) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
                             }
@@ -3186,11 +3191,11 @@ var PerpetualsClient = (function () {
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
                         case 3:
-                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _g.sent()]))();
+                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _f.sent()]))();
                             if (unWrappedSolBalance.lt(amountIn)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _g.label = 4;
+                            _f.label = 4;
                         case 4:
                             instructions.push(web3_js_1.SystemProgram.transfer({
                                 fromPubkey: publicKey,
@@ -3212,20 +3217,20 @@ var PerpetualsClient = (function () {
                                         additionalSigners: additionalSigners
                                     }];
                             }
-                            _g.label = 6;
+                            _f.label = 6;
                         case 6:
-                            _g.trys.push([6, 19, , 20]);
+                            _f.trys.push([6, 19, , 20]);
                             if (!(userInputTokenSymbol == 'SOL')) return [3, 9];
                             console.log("userInputTokenSymbol === sol", userInputTokenSymbol);
                             return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
                         case 7:
-                            accCreationLamports = (_g.sent());
+                            accCreationLamports = (_f.sent());
                             console.log("accCreationLamports:", accCreationLamports);
                             lamports = amountIn.add(new anchor_1.BN(accCreationLamports));
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
                         case 8:
-                            unWrappedSolBalance = new (_b.apply(anchor_1.BN, [void 0, _g.sent()]))();
+                            unWrappedSolBalance = new (_b.apply(anchor_1.BN, [void 0, _f.sent()]))();
                             if (unWrappedSolBalance.lt(amountIn)) {
                                 throw "Insufficient SOL Funds";
                             }
@@ -3252,18 +3257,18 @@ var PerpetualsClient = (function () {
                             userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 10:
-                            if (!(_g.sent())) {
+                            if (!(_f.sent())) {
                                 throw "Insufficient Funds , Token Account doesn't exist";
                             }
                             if (!!skipBalanceChecks) return [3, 12];
                             _c = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
                         case 11:
-                            tokenAccountBalance = new (_c.apply(anchor_1.BN, [void 0, (_g.sent()).value.amount]))();
+                            tokenAccountBalance = new (_c.apply(anchor_1.BN, [void 0, (_f.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(amountIn)) {
                                 throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            _g.label = 12;
+                            _f.label = 12;
                         case 12:
                             if (!(userOutputTokenSymbol == 'SOL')) return [3, 13];
                             lamports = (this.minimumBalanceForRentExemptAccountLamports);
@@ -3288,23 +3293,23 @@ var PerpetualsClient = (function () {
                             return [3, 17];
                         case 13: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true)];
                         case 14:
-                            userOutputTokenAccount = _g.sent();
+                            userOutputTokenAccount = _f.sent();
                             _d = createUserATA;
                             if (!_d) return [3, 16];
                             return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
                         case 15:
-                            _d = !(_g.sent());
-                            _g.label = 16;
+                            _d = !(_f.sent());
+                            _f.label = 16;
                         case 16:
                             if (_d) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey));
                             }
-                            _g.label = 17;
+                            _f.label = 17;
                         case 17:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
-                            for (_e = 0, _f = poolConfig.custodies; _e < _f.length; _e++) {
-                                custody = _f[_e];
+                            for (_i = 0, _e = poolConfig.custodies; _i < _e.length; _i++) {
+                                custody = _e[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -3344,7 +3349,7 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
                         case 18:
-                            inx = _g.sent();
+                            inx = _f.sent();
                             instructions.push(inx);
                             if (userOutputTokenSymbol == 'SOL' && unWrapSol) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userOutputTokenAccount, publicKey, publicKey);
@@ -3352,9 +3357,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 20];
                         case 19:
-                            err_4 = _g.sent();
-                            console.error("perpClient Swap error:: ", err_4);
-                            throw err_4;
+                            err_5 = _f.sent();
+                            console.error("perpClient Swap error:: ", err_5);
+                            throw err_5;
                         case 20: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -3364,7 +3369,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.swapFeeInternal = function (rewardTokenSymbol, swapTokenSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_5;
+            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_6;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -3424,9 +3429,9 @@ var PerpetualsClient = (function () {
                         instructions.push(inx);
                         return [3, 4];
                     case 3:
-                        err_5 = _b.sent();
-                        console.error("perpClient Swap error:: ", err_5);
-                        throw err_5;
+                        err_6 = _b.sent();
+                        console.error("perpClient Swap error:: ", err_6);
+                        throw err_6;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -3434,15 +3439,11 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCollateral = function (collateralWithFee_1, targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 6; _i < arguments.length; _i++) {
-                args_1[_i - 6] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([collateralWithFee_1, targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralWithFee, targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+        this.addCollateral = function (collateralWithFee, targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, userPayingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, instruction;
-                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -3536,15 +3537,11 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.swapAndAddCollateral = function (targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, minCollateralAmountOut_1, side_1, positionPubKey_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, minCollateralAmountOut_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, inputSymbol, collateralSymbol, amountIn, minCollateralAmountOut, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+        this.swapAndAddCollateral = function (targetSymbol, inputSymbol, collateralSymbol, amountIn, minCollateralAmountOut, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, marketAccount, instruction;
-                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -3655,16 +3652,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.removeCollateral = function (collateralWithFee_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 6; _i < arguments.length; _i++) {
-                args_1[_i - 6] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([collateralWithFee_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralWithFee, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+        this.removeCollateral = function (collateralWithFee, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, marketAccount, instruction, closeWsolATAIns, error_3;
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -3765,14 +3758,10 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.removeCollateralAndSwap = function (targetSymbol_1, collateralSymbol_1, outputSymbol_1, minSwapAmountOut_1, collateralDelta_1, side_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 7; _i < arguments.length; _i++) {
-                args_1[_i - 7] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, outputSymbol_1, minSwapAmountOut_1, collateralDelta_1, side_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, outputSymbol, minSwapAmountOut, collateralDelta, side, poolConfig, ephemeralSignerPubkey) {
+        this.removeCollateralAndSwap = function (targetSymbol, collateralSymbol, outputSymbol, minSwapAmountOut, collateralDelta, side, poolConfig, ephemeralSignerPubkey) {
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
                 var publicKey, targetCustodyConfig, collateralCustodyConfig, outputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, marketAccount, positionAccount, instruction;
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -3865,16 +3854,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.increaseSize = function (targetSymbol_1, collateralSymbol_1, positionPubKey_1, side_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1) {
-            var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, positionPubKey_1, side_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, positionPubKey, side, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
+        this.increaseSize = function (targetSymbol, collateralSymbol, positionPubKey, side, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            return __awaiter(_this, void 0, void 0, function () {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, instruction;
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -3929,16 +3914,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.decreaseSize = function (targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1) {
-            var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
+        this.decreaseSize = function (targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            return __awaiter(_this, void 0, void 0, function () {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, instruction;
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -3993,17 +3974,13 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.addLiquidity = function (payTokenSymbol_1, tokenAmountIn_1, minLpAmountOut_1, poolConfig_1) {
-            var args_1 = [];
-            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, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, tokenAccountBalance, _f, instruction, err_6;
-                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                return __generator(this, function (_g) {
-                    switch (_g.label) {
+        this.addLiquidity = function (payTokenSymbol, tokenAmountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, tokenAccountBalance, _e, instruction, err_7;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
                             payTokenCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey); });
@@ -4014,16 +3991,16 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _g.label = 1;
+                            _f.label = 1;
                         case 1:
-                            _g.trys.push([1, 10, , 11]);
+                            _f.trys.push([1, 10, , 11]);
                             userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(payTokenCustodyConfig.mintKey, publicKey, true);
                             lpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.stakedLpTokenMint, publicKey, true);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
-                            for (_a = 0, _b = poolConfig.custodies; _a < _b.length; _a++) {
-                                custody = _b[_a];
+                            for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                                custody = _a[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -4035,8 +4012,8 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            for (_c = 0, _d = poolConfig.markets; _c < _d.length; _c++) {
-                                market = _d[_c];
+                            for (_b = 0, _c = poolConfig.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
                                 markets.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
@@ -4045,21 +4022,21 @@ var PerpetualsClient = (function () {
                             }
                             return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
                         case 2:
-                            if (!(_g.sent())) {
+                            if (!(_f.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
                             }
                             if (!(payTokenSymbol == 'SOL')) return [3, 5];
                             console.log("payTokenSymbol === SOL", payTokenSymbol);
                             lamports = tokenAmountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
                             if (!!skipBalanceChecks) return [3, 4];
-                            _e = anchor_1.BN.bind;
+                            _d = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
                         case 3:
-                            unWrappedSolBalance = new (_e.apply(anchor_1.BN, [void 0, _g.sent()]))();
+                            unWrappedSolBalance = new (_d.apply(anchor_1.BN, [void 0, _f.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _g.label = 4;
+                            _f.label = 4;
                         case 4:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
@@ -4083,17 +4060,17 @@ var PerpetualsClient = (function () {
                             if (!!skipBalanceChecks) return [3, 8];
                             return [4, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
                         case 6:
-                            if (!(_g.sent())) {
+                            if (!(_f.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            _f = anchor_1.BN.bind;
+                            _e = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userPayingTokenAccount)];
                         case 7:
-                            tokenAccountBalance = new (_f.apply(anchor_1.BN, [void 0, (_g.sent()).value.amount]))();
+                            tokenAccountBalance = new (_e.apply(anchor_1.BN, [void 0, (_f.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(tokenAmountIn)) {
                                 throw "Insufficient Funds need more ".concat(tokenAmountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            _g.label = 8;
+                            _f.label = 8;
                         case 8: return [4, this.program.methods
                                 .addLiquidity({
                                 amountIn: tokenAmountIn,
@@ -4118,13 +4095,13 @@ var PerpetualsClient = (function () {
                                 .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                 .instruction()];
                         case 9:
-                            instruction = _g.sent();
+                            instruction = _f.sent();
                             instructions.push(instruction);
                             return [3, 11];
                         case 10:
-                            err_6 = _g.sent();
-                            console.error("perpClient addLiquidity error:: ", err_6);
-                            throw err_6;
+                            err_7 = _f.sent();
+                            console.error("perpClient addLiquidity error:: ", err_7);
+                            throw err_7;
                         case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4133,18 +4110,14 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.addLiquidityAndStake = function (inputSymbol_1, amountIn_1, minLpAmountOut_1, poolConfig_1) {
-            var args_1 = [];
-            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, flpStakeAccount, poolStakedLpVault, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, instruction;
-                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_g) {
-                    switch (_g.label) {
+        this.addLiquidityAndStake = function (inputSymbol, amountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, flpStakeAccount, poolStakedLpVault, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _c, custody, _d, _e, market, instruction;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -4164,14 +4137,14 @@ var PerpetualsClient = (function () {
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
                         case 1:
-                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _g.sent()]))();
+                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _f.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _g.label = 2;
+                            _f.label = 2;
                         case 2: return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
                         case 3:
-                            if (!(_g.sent())) {
+                            if (!(_f.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
                             }
                             if (!ephemeralSignerPubkey) {
@@ -4197,23 +4170,23 @@ var PerpetualsClient = (function () {
                             if (!!skipBalanceChecks) return [3, 7];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 5:
-                            if (!(_g.sent())) {
+                            if (!(_f.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
                         case 6:
-                            tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_g.sent()).value.amount]))();
+                            tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_f.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(amountIn)) {
                                 throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            _g.label = 7;
+                            _f.label = 7;
                         case 7:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
-                            for (_c = 0, _d = poolConfig.custodies; _c < _d.length; _c++) {
-                                custody = _d[_c];
+                            for (_i = 0, _c = poolConfig.custodies; _i < _c.length; _i++) {
+                                custody = _c[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -4225,8 +4198,8 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            for (_e = 0, _f = poolConfig.markets; _e < _f.length; _e++) {
-                                market = _f[_e];
+                            for (_d = 0, _e = poolConfig.markets; _d < _e.length; _d++) {
+                                market = _e[_d];
                                 markets.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
@@ -4258,7 +4231,7 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
                         case 8:
-                            instruction = _g.sent();
+                            instruction = _f.sent();
                             instructions.push(instruction);
                             return [2, {
                                     instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -4268,20 +4241,16 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.removeLiquidity = function (recieveTokenSymbol_1, liquidityAmountIn_1, minTokenAmountOut_1, poolConfig_1) {
-            var args_1 = [];
-            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, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, _e, removeLiquidityTx, closeInx, closeWsolATAIns, err_7;
-                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; }
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+        this.removeLiquidity = function (recieveTokenSymbol, liquidityAmountIn, minTokenAmountOut, poolConfig, closeLpATA, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey, userPublicKey) {
+            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; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, _d, removeLiquidityTx, closeInx, closeWsolATAIns, err_8;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             recieveTokenCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey); });
                             if (!recieveTokenCustodyConfig) {
@@ -4292,15 +4261,15 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _f.label = 1;
+                            _e.label = 1;
                         case 1:
-                            _f.trys.push([1, 7, , 8]);
+                            _e.trys.push([1, 7, , 8]);
                             stakedLpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.stakedLpTokenMint, publicKey, true);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
-                            for (_a = 0, _b = poolConfig.custodies; _a < _b.length; _a++) {
-                                custody = _b[_a];
+                            for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                                custody = _a[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -4312,8 +4281,8 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            for (_c = 0, _d = poolConfig.markets; _c < _d.length; _c++) {
-                                market = _d[_c];
+                            for (_b = 0, _c = poolConfig.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
                                 markets.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
@@ -4342,17 +4311,17 @@ var PerpetualsClient = (function () {
                             return [3, 5];
                         case 2:
                             userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey, publicKey, true);
-                            _e = createUserATA;
-                            if (!_e) return [3, 4];
+                            _d = createUserATA;
+                            if (!_d) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                         case 3:
-                            _e = !(_f.sent());
-                            _f.label = 4;
+                            _d = !(_e.sent());
+                            _e.label = 4;
                         case 4:
-                            if (_e) {
+                            if (_d) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey));
                             }
-                            _f.label = 5;
+                            _e.label = 5;
                         case 5: return [4, this.program.methods
                                 .removeLiquidity({
                                 lpAmountIn: liquidityAmountIn,
@@ -4377,7 +4346,7 @@ var PerpetualsClient = (function () {
                                 .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                 .instruction()];
                         case 6:
-                            removeLiquidityTx = _f.sent();
+                            removeLiquidityTx = _e.sent();
                             instructions.push(removeLiquidityTx);
                             if (closeLpATA) {
                                 closeInx = (0, spl_token_1.createCloseAccountInstruction)(stakedLpTokenAccount, publicKey, publicKey);
@@ -4389,9 +4358,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 8];
                         case 7:
-                            err_7 = _f.sent();
-                            console.log("perpClient removeLiquidity error:: ", err_7);
-                            throw err_7;
+                            err_8 = _e.sent();
+                            console.log("perpClient removeLiquidity error:: ", err_8);
+                            throw err_8;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4401,7 +4370,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.addReferral = function (tokenStakeAccount, nftReferralAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addReferralInstruction, err_8;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addReferralInstruction, err_9;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4428,9 +4397,9 @@ var PerpetualsClient = (function () {
                         instructions.push(addReferralInstruction);
                         return [3, 4];
                     case 3:
-                        err_8 = _a.sent();
-                        console.log("perpClient addReferral error:: ", err_8);
-                        throw err_8;
+                        err_9 = _a.sent();
+                        console.log("perpClient addReferral error:: ", err_9);
+                        throw err_9;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4439,7 +4408,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.createNftTradingAccount = function (nftMint, owner, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, createNftTradingAccountInstruction, err_9;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, createNftTradingAccountInstruction, err_10;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4474,9 +4443,9 @@ var PerpetualsClient = (function () {
                         instructions.push(createNftTradingAccountInstruction);
                         return [3, 4];
                     case 3:
-                        err_9 = _a.sent();
-                        console.log("perpClient createNftAccount error:: ", err_9);
-                        throw err_9;
+                        err_10 = _a.sent();
+                        console.log("perpClient createNftAccount error:: ", err_10);
+                        throw err_10;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4485,7 +4454,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.updateNftAccount = function (nftMint, updateReferer, updateBooster, flpStakeAccounts) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, flpStakeAccountMetas, _i, flpStakeAccounts_1, flpStakeAccountPk, updateNftTradingAccountInstruction, err_10;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, flpStakeAccountMetas, _i, flpStakeAccounts_1, flpStakeAccountPk, updateNftTradingAccountInstruction, err_11;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4535,9 +4504,9 @@ var PerpetualsClient = (function () {
                         instructions.push(updateNftTradingAccountInstruction);
                         return [3, 5];
                     case 4:
-                        err_10 = _a.sent();
-                        console.log("perpClient updateNftAccount error:: ", err_10);
-                        throw err_10;
+                        err_11 = _a.sent();
+                        console.log("perpClient updateNftAccount error:: ", err_11);
+                        throw err_11;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4546,7 +4515,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.levelUp = function (poolConfig, nftMint, authorizationRulesAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, levelUpInstruction, err_11;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, levelUpInstruction, err_12;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4585,9 +4554,9 @@ var PerpetualsClient = (function () {
                         instructions.push(levelUpInstruction);
                         return [3, 4];
                     case 3:
-                        err_11 = _a.sent();
-                        console.log("perpClient levelUp error:: ", err_11);
-                        throw err_11;
+                        err_12 = _a.sent();
+                        console.log("perpClient levelUp error:: ", err_12);
+                        throw err_12;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4596,7 +4565,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_12;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_13;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4634,9 +4603,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_12 = _a.sent();
-                        console.log("perpClient InitStaking error:: ", err_12);
-                        throw err_12;
+                        err_13 = _a.sent();
+                        console.log("perpClient InitStaking error:: ", err_13);
+                        throw err_13;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4645,7 +4614,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_13;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_14;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4690,9 +4659,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initCompoundingInstruction);
                         return [3, 4];
                     case 3:
-                        err_13 = _a.sent();
-                        console.log("perpClient initCompounding error:: ", err_13);
-                        throw err_13;
+                        err_14 = _a.sent();
+                        console.log("perpClient initCompounding error:: ", err_14);
+                        throw err_14;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4701,7 +4670,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.depositStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_14;
+            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_15;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4742,9 +4711,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_14 = _a.sent();
-                        console.log("perpClient depositStaking error:: ", err_14);
-                        throw err_14;
+                        err_15 = _a.sent();
+                        console.log("perpClient depositStaking error:: ", err_15);
+                        throw err_15;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4753,7 +4722,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.refreshStakeWithAllFlpStakeAccounts = function (rewardSymbol, poolConfig, flpStakeAccountPks) { return __awaiter(_this, void 0, void 0, function () {
-            var rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_1, flpStakeAccountPk, refreshStakeInstruction, err_15;
+            var rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_1, flpStakeAccountPk, refreshStakeInstruction, err_16;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -4800,33 +4769,29 @@ var PerpetualsClient = (function () {
                         refreshStakeInstruction = _c.sent();
                         return [2, refreshStakeInstruction];
                     case 2:
-                        err_15 = _c.sent();
-                        console.log("perpClient refreshStaking error:: ", err_15);
-                        throw err_15;
+                        err_16 = _c.sent();
+                        console.log("perpClient refreshStaking error:: ", err_16);
+                        throw err_16;
                     case 3: return [2];
                 }
             });
         }); };
-        this.refreshStakeWithTokenStake = function (rewardSymbol_1, poolConfig_1, flpStakeAccountPk_1) {
-            var args_1 = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                args_1[_i - 3] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, flpStakeAccountPk_1], args_1, true), void 0, function (rewardSymbol, poolConfig, flpStakeAccountPk, userPublicKey) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _a, _b, custody, stakeAccountMetas, tokenStakeAccount, refreshStakeInstruction, err_16;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+        this.refreshStakeWithTokenStake = function (rewardSymbol, poolConfig, flpStakeAccountPk, userPublicKey) {
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, stakeAccountMetas, tokenStakeAccount, refreshStakeInstruction, err_17;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
-                            _c.trys.push([0, 2, , 3]);
+                            _b.trys.push([0, 2, , 3]);
                             publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
                             rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
                             pool = poolConfig.poolAddress;
                             feeDistributionTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("custody_token_account"), pool.toBuffer(), rewardCustodyMint.toBuffer()], this.programId)[0];
                             custodyAccountMetas = [];
-                            for (_a = 0, _b = poolConfig.custodies; _a < _b.length; _a++) {
-                                custody = _b[_a];
+                            for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                                custody = _a[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -4858,25 +4823,21 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), stakeAccountMetas, true))
                                     .instruction()];
                         case 1:
-                            refreshStakeInstruction = _c.sent();
+                            refreshStakeInstruction = _b.sent();
                             return [2, refreshStakeInstruction];
                         case 2:
-                            err_16 = _c.sent();
-                            console.log("perpClient refreshStaking error:: ", err_16);
-                            throw err_16;
+                            err_17 = _b.sent();
+                            console.log("perpClient refreshStaking error:: ", err_17);
+                            throw err_17;
                         case 3: return [2];
                     }
                 });
             });
         };
-        this.unstakeInstant = function (rewardSymbol_1, unstakeAmount_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                args_1[_i - 3] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([rewardSymbol_1, unstakeAmount_1, poolConfig_1], args_1, true), void 0, function (rewardSymbol, unstakeAmount, poolConfig, userPublicKey) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _a, unstakeInstantInstruction, err_17;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
+        this.unstakeInstant = function (rewardSymbol, unstakeAmount, poolConfig, userPublicKey) {
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _a, unstakeInstantInstruction, err_18;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -4927,9 +4888,9 @@ var PerpetualsClient = (function () {
                             instructions.push(unstakeInstantInstruction);
                             return [3, 6];
                         case 5:
-                            err_17 = _b.sent();
-                            console.log("perpClient unstakeInstant error:: ", err_17);
-                            throw err_17;
+                            err_18 = _b.sent();
+                            console.log("perpClient unstakeInstant error:: ", err_18);
+                            throw err_18;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4939,7 +4900,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.setFeeShareBps = function (poolConfig, flpStakeAccountPks) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, pool, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_2, flpStakeAccountPk, refreshStakeInstruction, err_18;
+            var publicKey, pool, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_2, flpStakeAccountPk, refreshStakeInstruction, err_19;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -4983,15 +4944,15 @@ var PerpetualsClient = (function () {
                         refreshStakeInstruction = _c.sent();
                         return [2, refreshStakeInstruction];
                     case 2:
-                        err_18 = _c.sent();
-                        console.log("perpClient refreshStaking error:: ", err_18);
-                        throw err_18;
+                        err_19 = _c.sent();
+                        console.log("perpClient refreshStaking error:: ", err_19);
+                        throw err_19;
                     case 3: return [2];
                 }
             });
         }); };
         this.unstakeRequest = function (unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_19;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_20;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5025,9 +4986,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_19 = _a.sent();
-                        console.log("perpClient unstakeRequest error:: ", err_19);
-                        throw err_19;
+                        err_20 = _a.sent();
+                        console.log("perpClient unstakeRequest error:: ", err_20);
+                        throw err_20;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5035,17 +4996,13 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.withdrawStake = 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, pendingActivation, deactivated, createUserLPTA, userPublicKey) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_20;
-                if (pendingActivation === void 0) { pendingActivation = true; }
-                if (deactivated === void 0) { deactivated = true; }
-                if (createUserLPTA === void 0) { createUserLPTA = true; }
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
+        this.withdrawStake = function (poolConfig, pendingActivation, deactivated, createUserLPTA, userPublicKey) {
+            if (pendingActivation === void 0) { pendingActivation = true; }
+            if (deactivated === void 0) { deactivated = true; }
+            if (createUserLPTA === void 0) { createUserLPTA = true; }
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_21;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5096,9 +5053,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_20 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_20);
-                            throw err_20;
+                            err_21 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_21);
+                            throw err_21;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5107,14 +5064,10 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.collectStakeFees = function (rewardSymbol_1, poolConfig_1, tokenStakeAccount_1) {
-            var args_1 = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                args_1[_i - 3] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, tokenStakeAccount_1], args_1, true), void 0, function (rewardSymbol, poolConfig, tokenStakeAccount, createUserATA) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tokenStakeAccounts, withdrawStakeInstruction, err_21;
-                if (createUserATA === void 0) { createUserATA = true; }
+        this.collectStakeFees = function (rewardSymbol, poolConfig, tokenStakeAccount, createUserATA) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tokenStakeAccounts, withdrawStakeInstruction, err_22;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5173,9 +5126,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_21 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_21);
-                            throw err_21;
+                            err_22 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_22);
+                            throw err_22;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5185,7 +5138,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_22;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_23;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5226,9 +5179,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initTokenVaultInstruction);
                         return [3, 4];
                     case 3:
-                        err_22 = _a.sent();
-                        console.log("perpClient InitTokenVaultInstruction error:: ", err_22);
-                        throw err_22;
+                        err_23 = _a.sent();
+                        console.log("perpClient InitTokenVaultInstruction error:: ", err_23);
+                        throw err_23;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5237,7 +5190,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_23;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_24;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5268,9 +5221,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenVaultConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_23 = _a.sent();
-                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_23);
-                        throw err_23;
+                        err_24 = _a.sent();
+                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_24);
+                        throw err_24;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5279,7 +5232,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_24;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_25;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5317,9 +5270,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawInstantFeeInstruction);
                         return [3, 6];
                     case 5:
-                        err_24 = _a.sent();
-                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_24);
-                        throw err_24;
+                        err_25 = _a.sent();
+                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_25);
+                        throw err_25;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5328,7 +5281,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_25;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_26;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5365,9 +5318,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRevenueTokenAccountInstruction);
                         return [3, 4];
                     case 3:
-                        err_25 = _a.sent();
-                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_25);
-                        throw err_25;
+                        err_26 = _a.sent();
+                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_26);
+                        throw err_26;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5376,7 +5329,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.burnAndClaim = function (owner, nftMint, poolConfig, createAta) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, userTokenAccount, _a, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndClaimInstruction, err_26;
+            var preInstructions, instructions, postInstructions, additionalSigners, userTokenAccount, _a, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndClaimInstruction, err_27;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -5440,9 +5393,9 @@ var PerpetualsClient = (function () {
                         instructions.push(burnAndClaimInstruction);
                         return [3, 8];
                     case 7:
-                        err_26 = _b.sent();
-                        console.log("perpClient burnAndClaimInstruction error:: ", err_26);
-                        throw err_26;
+                        err_27 = _b.sent();
+                        console.log("perpClient burnAndClaimInstruction error:: ", err_27);
+                        throw err_27;
                     case 8: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5451,7 +5404,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.burnAndStake = function (owner, feePayer, nftMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndStakeInstruction, err_27;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndStakeInstruction, err_28;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5502,9 +5455,9 @@ var PerpetualsClient = (function () {
                         instructions.push(burnAndStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_27 = _a.sent();
-                        console.log("perpClient burnAndStakeInstruction error:: ", err_27);
-                        throw err_27;
+                        err_28 = _a.sent();
+                        console.log("perpClient burnAndStakeInstruction error:: ", err_28);
+                        throw err_28;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5513,7 +5466,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.depositTokenStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_28;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_29;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5554,9 +5507,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositTokenStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_28 = _a.sent();
-                        console.log("perpClient depositStakingInstruction error:: ", err_28);
-                        throw err_28;
+                        err_29 = _a.sent();
+                        console.log("perpClient depositStakingInstruction error:: ", err_29);
+                        throw err_29;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5565,7 +5518,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.unstakeTokenRequest = function (owner, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_29;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_30;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5594,9 +5547,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_29 = _a.sent();
-                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_29);
-                        throw err_29;
+                        err_30 = _a.sent();
+                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_30);
+                        throw err_30;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5605,7 +5558,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.unstakeTokenInstant = function (owner, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, unstakeTokenInstantInstruction, err_30;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, unstakeTokenInstantInstruction, err_31;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5645,9 +5598,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenInstantInstruction);
                         return [3, 5];
                     case 4:
-                        err_30 = _a.sent();
-                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_30);
-                        throw err_30;
+                        err_31 = _a.sent();
+                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_31);
+                        throw err_31;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5656,7 +5609,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawToken = function (owner, withdrawRequestId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_31;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_32;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5696,9 +5649,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawTokenInstruction);
                         return [3, 5];
                     case 4:
-                        err_31 = _a.sent();
-                        console.log("perpClient withdrawTokenInstruction error:: ", err_31);
-                        throw err_31;
+                        err_32 = _a.sent();
+                        console.log("perpClient withdrawTokenInstruction error:: ", err_32);
+                        throw err_32;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5707,7 +5660,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelUnstakeRequest = function (owner, withdrawRequestId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeRequestInstruction, err_32;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeRequestInstruction, err_33;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5736,9 +5689,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelUnstakeRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_32 = _a.sent();
-                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_32);
-                        throw err_32;
+                        err_33 = _a.sent();
+                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_33);
+                        throw err_33;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5747,7 +5700,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_33;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_34;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5785,9 +5738,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_33 = _a.sent();
-                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_33);
-                        throw err_33;
+                        err_34 = _a.sent();
+                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_34);
+                        throw err_34;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5796,7 +5749,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_34;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_35;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5828,9 +5781,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_34 = _a.sent();
-                        console.log("perpClient setTokenRewardInstruction error:: ", err_34);
-                        throw err_34;
+                        err_35 = _a.sent();
+                        console.log("perpClient setTokenRewardInstruction error:: ", err_35);
+                        throw err_35;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5838,14 +5791,10 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.collectTokenReward = function (owner_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 2; _i < arguments.length; _i++) {
-                args_1[_i - 2] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([owner_1, poolConfig_1], args_1, true), void 0, function (owner, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, _a, collectTokenRewardInstruction, err_35;
-                if (createUserATA === void 0) { createUserATA = true; }
+        this.collectTokenReward = function (owner, poolConfig, createUserATA) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, _a, collectTokenRewardInstruction, err_36;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5889,9 +5838,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectTokenRewardInstruction);
                             return [3, 6];
                         case 5:
-                            err_35 = _b.sent();
-                            console.log("perpClient collectTokenRewardInstruction error:: ", err_35);
-                            throw err_35;
+                            err_36 = _b.sent();
+                            console.log("perpClient collectTokenRewardInstruction error:: ", err_36);
+                            throw err_36;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5900,14 +5849,10 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.collectRevenue = function (owner_1, rewardSymbol_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                args_1[_i - 3] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([owner_1, rewardSymbol_1, poolConfig_1], args_1, true), void 0, function (owner, rewardSymbol, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_36;
-                if (createUserATA === void 0) { createUserATA = true; }
+        this.collectRevenue = function (owner, rewardSymbol, poolConfig, createUserATA) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_37;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5952,9 +5897,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectRevenueInstruction);
                             return [3, 6];
                         case 5:
-                            err_36 = _b.sent();
-                            console.log("perpClient collectRevenueInstruction error:: ", err_36);
-                            throw err_36;
+                            err_37 = _b.sent();
+                            console.log("perpClient collectRevenueInstruction error:: ", err_37);
+                            throw err_37;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5964,7 +5909,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.setTokenStakeLevel = function (owner, stakeLevel) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_37;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_38;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5992,9 +5937,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenStakeLevelInstruction);
                         return [3, 4];
                     case 3:
-                        err_37 = _a.sent();
-                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_37);
-                        throw err_37;
+                        err_38 = _a.sent();
+                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_38);
+                        throw err_38;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6003,7 +5948,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRewardVault = function (nftCount, rewardSymbol, collectionMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, nftTransferAuthority, initRewardVault, err_38;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, nftTransferAuthority, initRewardVault, err_39;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6040,9 +5985,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_38 = _a.sent();
-                        console.log("perpClient InitRewardVault error:: ", err_38);
-                        throw err_38;
+                        err_39 = _a.sent();
+                        console.log("perpClient InitRewardVault error:: ", err_39);
+                        throw err_39;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6051,7 +5996,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.distributeReward = function (rewardAmount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_39;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_40;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6082,9 +6027,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 4];
                     case 3:
-                        err_39 = _a.sent();
-                        console.log("perpClient distributeReward error:: ", err_39);
-                        throw err_39;
+                        err_40 = _a.sent();
+                        console.log("perpClient distributeReward error:: ", err_40);
+                        throw err_40;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6092,14 +6037,10 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.collectNftReward = function (rewardSymbol_1, poolConfig_1, nftMint_1) {
-            var args_1 = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                args_1[_i - 3] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, nftMint_1], args_1, true), void 0, function (rewardSymbol, poolConfig, nftMint, createUserATA) {
-                var publicKey, rewardCustodyMint, instructions, additionalSigners, nftTokenAccount, metadataAccount, receivingTokenAccount, _a, rewardRecord, rewardVault, rewardTokenAccount, nftTransferAuthority, collectNftReward, err_40;
-                if (createUserATA === void 0) { createUserATA = true; }
+        this.collectNftReward = function (rewardSymbol, poolConfig, nftMint, createUserATA) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, nftTokenAccount, metadataAccount, receivingTokenAccount, _a, rewardRecord, rewardVault, rewardTokenAccount, nftTransferAuthority, collectNftReward, err_41;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6149,8 +6090,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectNftReward);
                             return [3, 6];
                         case 5:
-                            err_40 = _b.sent();
-                            throw err_40;
+                            err_41 = _b.sent();
+                            throw err_41;
                         case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners
@@ -6159,14 +6100,10 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.collectAndDistributeFee = function (rewardSymbol_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 2; _i < arguments.length; _i++) {
-                args_1[_i - 2] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1], args_1, true), void 0, function (rewardSymbol, poolConfig, createUserATA, nftTradingAccount) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, rewardVault, rewardTokenAccount, withdrawStakeInstruction, err_41;
-                if (createUserATA === void 0) { createUserATA = true; }
+        this.collectAndDistributeFee = function (rewardSymbol, poolConfig, createUserATA, nftTradingAccount) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, rewardVault, rewardTokenAccount, withdrawStakeInstruction, err_42;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6230,9 +6167,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_41 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_41);
-                            throw err_41;
+                            err_42 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_42);
+                            throw err_42;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6242,7 +6179,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.setTriggerPrice = function (targetSymbol, collateralSymbol, side, triggerPrice, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, positionAccount, instructions, additionalSigners, setTriggerPrice, err_42;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, positionAccount, instructions, additionalSigners, setTriggerPrice, err_43;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6281,9 +6218,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTriggerPrice);
                         return [3, 4];
                     case 3:
-                        err_42 = _a.sent();
-                        console.log("perpClient setTriggerPrice error:: ", err_42);
-                        throw err_42;
+                        err_43 = _a.sent();
+                        console.log("perpClient setTriggerPrice error:: ", err_43);
+                        throw err_43;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6291,16 +6228,12 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.forceClosePosition = function (positionAccount_1, targetSymbol_1, collateralSymbol_1, side_1, isStopLoss_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 6; _i < arguments.length; _i++) {
-                args_1[_i - 6] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([positionAccount_1, targetSymbol_1, collateralSymbol_1, side_1, isStopLoss_1, poolConfig_1], args_1, true), void 0, function (positionAccount, targetSymbol, collateralSymbol, side, isStopLoss, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, forceClosePosition, closeWsolATAIns, err_43;
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+        this.forceClosePosition = function (positionAccount, targetSymbol, collateralSymbol, side, isStopLoss, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, forceClosePosition, closeWsolATAIns, err_44;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6361,9 +6294,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 7];
                         case 6:
-                            err_43 = _b.sent();
-                            console.log("perpClient forceClosePosition error:: ", err_43);
-                            throw err_43;
+                            err_44 = _b.sent();
+                            console.log("perpClient forceClosePosition error:: ", err_44);
+                            throw err_44;
                         case 7: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6372,15 +6305,11 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.placeLimitOrder = function (targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, limitPrice_1, reserveAmount_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 11; _i < arguments.length; _i++) {
-                args_1[_i - 11] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, limitPrice_1, reserveAmount_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, limitPrice, reserveAmount, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_44;
-                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+        this.placeLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, limitPrice, reserveAmount, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_45;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -6485,9 +6414,9 @@ var PerpetualsClient = (function () {
                             instructions.push(placeLimitOrder);
                             return [3, 11];
                         case 10:
-                            err_44 = _c.sent();
-                            console.log("perpClient placeLimitOrder error:: ", err_44);
-                            throw err_44;
+                            err_45 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_45);
+                            throw err_45;
                         case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6496,15 +6425,11 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.editLimitOrder = function (targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, orderId_1, limitPrice_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 11; _i < arguments.length; _i++) {
-                args_1[_i - 11] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, orderId_1, limitPrice_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey) {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_45;
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+        this.editLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_46;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6592,9 +6517,9 @@ var PerpetualsClient = (function () {
                             instructions.push(editLimitOrder);
                             return [3, 8];
                         case 7:
-                            err_45 = _b.sent();
-                            console.log("perpClient editLimitOrder error:: ", err_45);
-                            throw err_45;
+                            err_46 = _b.sent();
+                            console.log("perpClient editLimitOrder error:: ", err_46);
+                            throw err_46;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6603,16 +6528,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.executeLimitOrder = function (userPubkey_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, poolConfig_1, privilege_1) {
-            var args_1 = [];
-            for (var _i = 7; _i < arguments.length; _i++) {
-                args_1[_i - 7] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([userPubkey_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, poolConfig_1, privilege_1], args_1, true), void 0, function (userPubkey, targetSymbol, collateralSymbol, side, orderId, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_46;
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+        this.executeLimitOrder = function (userPubkey, targetSymbol, collateralSymbol, side, orderId, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_47;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -6661,9 +6582,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitOrder);
                             return [3, 4];
                         case 3:
-                            err_46 = _a.sent();
-                            console.log("perpClient executeLimitOrder error:: ", err_46);
-                            throw err_46;
+                            err_47 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_47);
+                            throw err_47;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6672,16 +6593,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.executeLimitWithSwap = function (userPubkey_1, targetSymbol_1, collateralSymbol_1, reserveSymbol_1, side_1, orderId_1, poolConfig_1, privilege_1) {
-            var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([userPubkey_1, targetSymbol_1, collateralSymbol_1, reserveSymbol_1, side_1, orderId_1, poolConfig_1, privilege_1], args_1, true), void 0, function (userPubkey, targetSymbol, collateralSymbol, reserveSymbol, side, orderId, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitWithSwap, err_47;
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+        this.executeLimitWithSwap = function (userPubkey, targetSymbol, collateralSymbol, reserveSymbol, side, orderId, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitWithSwap, err_48;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -6733,9 +6650,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitWithSwap);
                             return [3, 4];
                         case 3:
-                            err_47 = _a.sent();
-                            console.log("perpClient executeLimitWithSwap error:: ", err_47);
-                            throw err_47;
+                            err_48 = _a.sent();
+                            console.log("perpClient executeLimitWithSwap error:: ", err_48);
+                            throw err_48;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6745,7 +6662,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.placeTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_48;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_49;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6793,9 +6710,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_48 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_48);
-                        throw err_48;
+                        err_49 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_49);
+                        throw err_49;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6804,7 +6721,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.editTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_49;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_50;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6851,9 +6768,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_49 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_49);
-                        throw err_49;
+                        err_50 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_50);
+                        throw err_50;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6862,7 +6779,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_50;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_51;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6895,9 +6812,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_50 = _a.sent();
-                        console.log("perpClient cancelTriggerOrder error:: ", err_50);
-                        throw err_50;
+                        err_51 = _a.sent();
+                        console.log("perpClient cancelTriggerOrder error:: ", err_51);
+                        throw err_51;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6906,7 +6823,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelAllTriggerOrders = function (targetSymbol, collateralSymbol, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_51;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_52;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6937,9 +6854,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelAllTriggerOrders);
                         return [3, 4];
                     case 3:
-                        err_51 = _a.sent();
-                        console.log("perpClient cancelAllTriggerOrders error:: ", err_51);
-                        throw err_51;
+                        err_52 = _a.sent();
+                        console.log("perpClient cancelAllTriggerOrders error:: ", err_52);
+                        throw err_52;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6947,20 +6864,16 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.executeTriggerWithSwap = function (owner_1, targetSymbol_1, collateralSymbol_1, receivingSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 9; _i < arguments.length; _i++) {
-                args_1[_i - 9] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([owner_1, targetSymbol_1, collateralSymbol_1, receivingSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1], args_1, true), void 0, function (owner, targetSymbol, collateralSymbol, receivingSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _c, _d, custody, executeTriggerWithSwap, err_52;
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+        this.executeTriggerWithSwap = function (owner, targetSymbol, collateralSymbol, receivingSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, executeTriggerWithSwap, err_53;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             payerPubkey = this.provider.wallet.publicKey;
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
@@ -6971,9 +6884,9 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _e.label = 1;
+                            _d.label = 1;
                         case 1:
-                            _e.trys.push([1, 9, , 10]);
+                            _d.trys.push([1, 9, , 10]);
                             if (!false) return [3, 2];
                             return [3, 7];
                         case 2:
@@ -6982,8 +6895,8 @@ var PerpetualsClient = (function () {
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                         case 3:
-                            _a = !(_e.sent());
-                            _e.label = 4;
+                            _a = !(_d.sent());
+                            _d.label = 4;
                         case 4:
                             if (_a) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, owner, poolConfig.getTokenFromSymbol(receivingSymbol).mintKey));
@@ -6993,20 +6906,20 @@ var PerpetualsClient = (function () {
                             if (!_b) return [3, 6];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccountCollateral, this.provider.connection)];
                         case 5:
-                            _b = !(_e.sent());
-                            _e.label = 6;
+                            _b = !(_d.sent());
+                            _d.label = 6;
                         case 6:
                             if (_b) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccountCollateral, owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
-                            _e.label = 7;
+                            _d.label = 7;
                         case 7:
                             positionAccount = poolConfig.getPositionFromMarketPk(owner, marketAccount);
                             orderAccount = poolConfig.getOrderFromMarketPk(owner, marketAccount);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
-                            for (_c = 0, _d = poolConfig.custodies; _c < _d.length; _c++) {
-                                custody = _d[_c];
+                            for (_i = 0, _c = poolConfig.custodies; _i < _c.length; _i++) {
+                                custody = _c[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -7051,13 +6964,13 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
                                     .instruction()];
                         case 8:
-                            executeTriggerWithSwap = _e.sent();
+                            executeTriggerWithSwap = _d.sent();
                             instructions.push(executeTriggerWithSwap);
                             return [3, 10];
                         case 9:
-                            err_52 = _e.sent();
-                            console.log("perpClient executeTriggerWithSwap error:: ", err_52);
-                            throw err_52;
+                            err_53 = _d.sent();
+                            console.log("perpClient executeTriggerWithSwap error:: ", err_53);
+                            throw err_53;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -7066,18 +6979,14 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.executeTriggerOrder = function (owner_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([owner_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1], args_1, true), void 0, function (owner, targetSymbol, collateralSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_53;
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+        this.executeTriggerOrder = function (owner, targetSymbol, collateralSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_54;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -7143,9 +7052,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerOrder);
                             return [3, 8];
                         case 7:
-                            err_53 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_53);
-                            throw err_53;
+                            err_54 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_54);
+                            throw err_54;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -7155,7 +7064,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.migrateTriggerOrder = function (owner, marketAccount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var payerPubkey, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_54;
+            var payerPubkey, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_55;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7185,9 +7094,9 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_54 = _a.sent();
-                        console.log("perpClient migrateTriggerOrder error:: ", err_54);
-                        throw err_54;
+                        err_55 = _a.sent();
+                        console.log("perpClient migrateTriggerOrder error:: ", err_55);
+                        throw err_55;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7196,7 +7105,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.getPositionData = function (position, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_55;
+            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_56;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7225,15 +7134,15 @@ var PerpetualsClient = (function () {
                         console.log(getPositionData);
                         return [2, getPositionData];
                     case 3:
-                        err_55 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_55);
-                        throw err_55;
+                        err_56 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_56);
+                        throw err_56;
                     case 4: return [2];
                 }
             });
         }); };
         this.protocolWithdrawFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_56;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_57;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7265,9 +7174,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_56 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_56);
-                        throw err_56;
+                        err_57 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_57);
+                        throw err_57;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7276,7 +7185,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.moveProtocolFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_57;
+            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_58;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7309,9 +7218,9 @@ var PerpetualsClient = (function () {
                         instructions.push(moveProtocolFeesIx);
                         return [3, 4];
                     case 3:
-                        err_57 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_57);
-                        throw err_57;
+                        err_58 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_58);
+                        throw err_58;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7320,7 +7229,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setProtocolFeeShareBps = function (feeShareBps, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, setProtocolFeeShareBpsIx, err_58;
+            var publicKey, setProtocolFeeShareBpsIx, err_59;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7340,15 +7249,15 @@ var PerpetualsClient = (function () {
                         setProtocolFeeShareBpsIx = _a.sent();
                         return [2, setProtocolFeeShareBpsIx];
                     case 2:
-                        err_58 = _a.sent();
-                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_58);
-                        throw err_58;
+                        err_59 = _a.sent();
+                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_59);
+                        throw err_59;
                     case 3: return [2];
                 }
             });
         }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_59;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_60;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7375,9 +7284,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_59 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_59);
-                        throw err_59;
+                        err_60 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_60);
+                        throw err_60;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7386,7 +7295,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.reimburse = function (tokenMint, amountIn, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_60;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_61;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -7446,9 +7355,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_60 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_60);
-                        throw err_60;
+                        err_61 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_61);
+                        throw err_61;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7457,7 +7366,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalOraclePrice = function (tokenMint, price, expo, conf, ema, publishTime, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_61;
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_62;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7490,9 +7399,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_61 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_61);
-                        throw err_61;
+                        err_62 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_62);
+                        throw err_62;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7500,18 +7409,14 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCompoundingLiquidity = function (amountIn_1, minCompoundingAmountOut_1, inTokenSymbol_1, rewardTokenMint_1, poolConfig_1) {
-            var args_1 = [];
-            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) {
-                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, addCompoundingLiquidity, err_62;
-                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+        this.addCompoundingLiquidity = function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, addCompoundingLiquidity, err_63;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -7528,8 +7433,8 @@ var PerpetualsClient = (function () {
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
-                            for (_a = 0, _b = poolConfig.custodies; _a < _b.length; _a++) {
-                                custody = _b[_a];
+                            for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                                custody = _a[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -7541,8 +7446,8 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            for (_c = 0, _d = poolConfig.markets; _c < _d.length; _c++) {
-                                market = _d[_c];
+                            for (_b = 0, _c = poolConfig.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
                                 markets.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
@@ -7551,26 +7456,26 @@ var PerpetualsClient = (function () {
                             }
                             return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
                         case 1:
-                            if (!(_f.sent())) {
+                            if (!(_e.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
                             }
                             return [4, (0, utils_1.checkIfAccountExists)(compoundingTokenAccount, this.provider.connection)];
                         case 2:
-                            if (!(_f.sent())) {
+                            if (!(_e.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, compoundingTokenAccount, publicKey, poolConfig.compoundingTokenMint));
                             }
                             if (!(inTokenSymbol == 'SOL')) return [3, 5];
                             console.log("inTokenSymbol === SOL", inTokenSymbol);
                             lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
                             if (!!skipBalanceChecks) return [3, 4];
-                            _e = anchor_1.BN.bind;
+                            _d = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
                         case 3:
-                            unWrappedSolBalance = new (_e.apply(anchor_1.BN, [void 0, _f.sent()]))();
+                            unWrappedSolBalance = new (_d.apply(anchor_1.BN, [void 0, _e.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _f.label = 4;
+                            _e.label = 4;
                         case 4:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
@@ -7594,12 +7499,12 @@ var PerpetualsClient = (function () {
                             if (!!skipBalanceChecks) return [3, 7];
                             return [4, (0, utils_1.checkIfAccountExists)(fundingAccount, this.provider.connection)];
                         case 6:
-                            if (!(_f.sent())) {
+                            if (!(_e.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            _f.label = 7;
+                            _e.label = 7;
                         case 7:
-                            _f.trys.push([7, 9, , 10]);
+                            _e.trys.push([7, 9, , 10]);
                             return [4, this.program.methods
                                     .addCompoundingLiquidity({
                                     amountIn: amountIn,
@@ -7628,12 +7533,12 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
                         case 8:
-                            addCompoundingLiquidity = _f.sent();
+                            addCompoundingLiquidity = _e.sent();
                             instructions.push(addCompoundingLiquidity);
                             return [3, 10];
                         case 9:
-                            err_62 = _f.sent();
-                            console.log("perpClient addCompoundingLiquidity error:: ", err_62);
+                            err_63 = _e.sent();
+                            console.log("perpClient addCompoundingLiquidity error:: ", err_63);
                             return [3, 10];
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -7643,18 +7548,14 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.removeCompoundingLiquidity = function (compoundingAmountIn_1, minAmountOut_1, outTokenSymbol_1, rewardTokenMint_1, poolConfig_1) {
-            var args_1 = [];
-            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) {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, compoundingTokenAccount, removeCompoundingLiquidity, err_63;
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+        this.removeCompoundingLiquidity = function (compoundingAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA, ephemeralSignerPubkey, userPublicKey) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, compoundingTokenAccount, removeCompoundingLiquidity, err_64;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -7691,19 +7592,19 @@ var PerpetualsClient = (function () {
                             if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                         case 2:
-                            _a = !(_f.sent());
-                            _f.label = 3;
+                            _a = !(_e.sent());
+                            _e.label = 3;
                         case 3:
                             if (_a) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, outCustodyConfig.mintKey));
                             }
-                            _f.label = 4;
+                            _e.label = 4;
                         case 4:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
-                            for (_b = 0, _c = poolConfig.custodies; _b < _c.length; _b++) {
-                                custody = _c[_b];
+                            for (_i = 0, _b = poolConfig.custodies; _i < _b.length; _i++) {
+                                custody = _b[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -7715,8 +7616,8 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            for (_d = 0, _e = poolConfig.markets; _d < _e.length; _d++) {
-                                market = _e[_d];
+                            for (_c = 0, _d = poolConfig.markets; _c < _d.length; _c++) {
+                                market = _d[_c];
                                 markets.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
@@ -7724,9 +7625,9 @@ var PerpetualsClient = (function () {
                                 });
                             }
                             compoundingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(compoundingTokenMint, publicKey, true);
-                            _f.label = 5;
+                            _e.label = 5;
                         case 5:
-                            _f.trys.push([5, 7, , 8]);
+                            _e.trys.push([5, 7, , 8]);
                             return [4, this.program.methods
                                     .removeCompoundingLiquidity({
                                     compoundingAmountIn: compoundingAmountIn,
@@ -7755,12 +7656,12 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
                         case 6:
-                            removeCompoundingLiquidity = _f.sent();
+                            removeCompoundingLiquidity = _e.sent();
                             instructions.push(removeCompoundingLiquidity);
                             return [3, 8];
                         case 7:
-                            err_63 = _f.sent();
-                            console.log("perpClient removeCompoundingLiquidity error:: ", err_63);
+                            err_64 = _e.sent();
+                            console.log("perpClient removeCompoundingLiquidity error:: ", err_64);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -7770,16 +7671,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.migrateStake = function (amount_1, rewardTokenMint_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                args_1[_i - 3] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([amount_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amount, rewardTokenMint, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _b, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, migrateStake, err_64;
-                if (createUserATA === void 0) { createUserATA = true; }
-                return __generator(this, function (_g) {
-                    switch (_g.label) {
+        this.migrateStake = function (amount, rewardTokenMint, poolConfig, createUserATA) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _b, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _c, custody, _d, _e, market, migrateStake, err_65;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -7794,8 +7691,8 @@ var PerpetualsClient = (function () {
                             if (!_a) return [3, 2];
                             return [4, (0, utils_1.checkIfAccountExists)(compoudingTokenAccount, this.provider.connection)];
                         case 1:
-                            _a = !(_g.sent());
-                            _g.label = 2;
+                            _a = !(_f.sent());
+                            _f.label = 2;
                         case 2:
                             if (_a) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, compoudingTokenAccount, publicKey, compoundingTokenMint));
@@ -7807,8 +7704,8 @@ var PerpetualsClient = (function () {
                             if (!_b) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(tokenStakeAccount, this.provider.connection)];
                         case 3:
-                            _b = (_g.sent());
-                            _g.label = 4;
+                            _b = (_f.sent());
+                            _f.label = 4;
                         case 4:
                             if (_b) {
                                 tokenStakeAccounts.push({
@@ -7821,8 +7718,8 @@ var PerpetualsClient = (function () {
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
-                            for (_c = 0, _d = poolConfig.custodies; _c < _d.length; _c++) {
-                                custody = _d[_c];
+                            for (_i = 0, _c = poolConfig.custodies; _i < _c.length; _i++) {
+                                custody = _c[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -7834,17 +7731,17 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            for (_e = 0, _f = poolConfig.markets; _e < _f.length; _e++) {
-                                market = _f[_e];
+                            for (_d = 0, _e = poolConfig.markets; _d < _e.length; _d++) {
+                                market = _e[_d];
                                 markets.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
                                     isWritable: false,
                                 });
                             }
-                            _g.label = 5;
+                            _f.label = 5;
                         case 5:
-                            _g.trys.push([5, 7, , 8]);
+                            _f.trys.push([5, 7, , 8]);
                             return [4, this.program.methods
                                     .migrateStake({
                                     amount: amount
@@ -7870,12 +7767,12 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), tokenStakeAccounts, true))
                                     .instruction()];
                         case 6:
-                            migrateStake = _g.sent();
+                            migrateStake = _f.sent();
                             instructions.push(migrateStake);
                             return [3, 8];
                         case 7:
-                            err_64 = _g.sent();
-                            console.log("perpClient migrateStake error:: ", err_64);
+                            err_65 = _f.sent();
+                            console.log("perpClient migrateStake error:: ", err_65);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -7886,7 +7783,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.migrateFlp = function (amount, rewardTokenMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_65;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_66;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -7958,8 +7855,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_65 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_65);
+                        err_66 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_66);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -7968,16 +7865,12 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.compoundingFee = 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, rewardTokenSymbol) {
-                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, compoundingFee, err_66;
-                if (rewardTokenSymbol === void 0) { rewardTokenSymbol = 'USDC'; }
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+        this.compoundingFee = function (poolConfig, rewardTokenSymbol) {
+            if (rewardTokenSymbol === void 0) { rewardTokenSymbol = 'USDC'; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, compoundingFee, err_67;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             instructions = [];
                             additionalSigners = [];
@@ -7986,8 +7879,8 @@ var PerpetualsClient = (function () {
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
-                            for (_a = 0, _b = poolConfig.custodies; _a < _b.length; _a++) {
-                                custody = _b[_a];
+                            for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                                custody = _a[_i];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -7999,17 +7892,17 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            for (_c = 0, _d = poolConfig.markets; _c < _d.length; _c++) {
-                                market = _d[_c];
+                            for (_b = 0, _c = poolConfig.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
                                 markets.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
                                     isWritable: false,
                                 });
                             }
-                            _e.label = 1;
+                            _d.label = 1;
                         case 1:
-                            _e.trys.push([1, 3, , 4]);
+                            _d.trys.push([1, 3, , 4]);
                             return [4, this.program.methods
                                     .compoundFees({})
                                     .accounts({
@@ -8028,12 +7921,12 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
                         case 2:
-                            compoundingFee = _e.sent();
+                            compoundingFee = _d.sent();
                             instructions.push(compoundingFee);
                             return [3, 4];
                         case 3:
-                            err_66 = _e.sent();
-                            console.log("perpClient compoundingFee error:: ", err_66);
+                            err_67 = _d.sent();
+                            console.log("perpClient compoundingFee error:: ", err_67);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -8044,7 +7937,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.renameFlp = function (flag, lpTokenName, lpTokenSymbol, lpTokenUri, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_67;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_68;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8082,8 +7975,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_67 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_67);
+                        err_68 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_68);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -8193,9 +8086,9 @@ var PerpetualsClient = (function () {
             }
         }
     };
-    PerpetualsClient.prototype.sendTransaction = function (ixs_1) {
-        return __awaiter(this, arguments, void 0, function (ixs, opts) {
-            if (opts === void 0) { opts = {}; }
+    PerpetualsClient.prototype.sendTransaction = function (ixs, opts) {
+        if (opts === void 0) { opts = {}; }
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, (0, rpc_1.sendTransaction)(this.program.provider, ixs, __assign({ postSendTxCallback: this.postSendTxCallback, prioritizationFee: this.prioritizationFee }, opts))];
@@ -8204,9 +8097,9 @@ var PerpetualsClient = (function () {
             });
         });
     };
-    PerpetualsClient.prototype.sendTransactionV3 = function (ixs_1) {
-        return __awaiter(this, arguments, void 0, function (ixs, opts) {
-            if (opts === void 0) { opts = {}; }
+    PerpetualsClient.prototype.sendTransactionV3 = function (ixs, opts) {
+        if (opts === void 0) { opts = {}; }
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, (0, rpc_1.sendTransactionV3)(this.program.provider, ixs, __assign({ postSendTxCallback: this.postSendTxCallback, prioritizationFee: this.prioritizationFee }, opts))];