flash-sdk 2.47.3 → 2.48.0-alpha.0

package/dist/PerpetualsClient.js

@@ -2149,40 +2149,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,
@@ -2205,14 +2201,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, {
@@ -2223,40 +2219,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,
@@ -2279,14 +2271,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, {
@@ -2362,40 +2354,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,
@@ -2406,7 +2394,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,
@@ -2425,11 +2413,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, {
@@ -2440,40 +2428,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,
@@ -2484,7 +2468,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,
@@ -2503,11 +2487,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, {
@@ -2646,18 +2630,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:
@@ -2761,19 +2741,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:
@@ -2870,18 +2846,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) {
+        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_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; }
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -3021,17 +2993,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) {
+        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_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; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -3145,20 +3113,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_4;
+                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) {
@@ -3176,10 +3140,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));
                             }
@@ -3187,11 +3151,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,
@@ -3213,20 +3177,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";
                             }
@@ -3253,18 +3217,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);
@@ -3289,23 +3253,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,
@@ -3345,7 +3309,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);
@@ -3353,7 +3317,7 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 20];
                         case 19:
-                            err_4 = _g.sent();
+                            err_4 = _f.sent();
                             console.error("perpClient Swap error:: ", err_4);
                             throw err_4;
                         case 20: return [2, {
@@ -3435,15 +3399,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:
@@ -3537,15 +3497,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:
@@ -3656,16 +3612,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:
@@ -3766,14 +3718,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:
@@ -3866,16 +3814,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:
@@ -3930,16 +3874,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:
@@ -3994,17 +3934,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_6;
+                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); });
@@ -4015,16 +3951,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,
@@ -4036,8 +3972,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,
@@ -4046,21 +3982,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();
@@ -4084,17 +4020,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,
@@ -4119,11 +4055,11 @@ 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();
+                            err_6 = _f.sent();
                             console.error("perpClient addLiquidity error:: ", err_6);
                             throw err_6;
                         case 11: return [2, {
@@ -4134,18 +4070,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 = [];
@@ -4165,14 +4097,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) {
@@ -4198,23 +4130,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,
@@ -4226,8 +4158,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,
@@ -4259,7 +4191,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),
@@ -4269,20 +4201,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_7;
+                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) {
@@ -4293,15 +4221,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,
@@ -4313,8 +4241,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,
@@ -4343,17 +4271,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,
@@ -4378,7 +4306,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);
@@ -4390,7 +4318,7 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 8];
                         case 7:
-                            err_7 = _f.sent();
+                            err_7 = _e.sent();
                             console.log("perpClient removeLiquidity error:: ", err_7);
                             throw err_7;
                         case 8: return [2, {
@@ -4808,26 +4736,22 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        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_16;
+                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,
@@ -4859,10 +4783,10 @@ 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();
+                            err_16 = _b.sent();
                             console.log("perpClient refreshStaking error:: ", err_16);
                             throw err_16;
                         case 3: return [2];
@@ -5029,16 +4953,12 @@ 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) {
+        this.withdrawStake = function (poolConfig, pendingActivation, deactivated, createUserLPTA) {
+            if (pendingActivation === void 0) { pendingActivation = true; }
+            if (deactivated === void 0) { deactivated = true; }
+            if (createUserLPTA === void 0) { createUserLPTA = true; }
+            return __awaiter(_this, void 0, void 0, function () {
                 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; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5100,14 +5020,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) {
+        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_21;
-                if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5319,8 +5235,54 @@ 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;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
+                        return [4, this.program.methods
+                                .initRevenueTokenAccount({
+                                feeShareBps: feeShareBps
+                            })
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                transferAuthority: poolConfig.transferAuthority,
+                                tokenVault: poolConfig.tokenVault,
+                                rewardMint: rewardCustodyMint,
+                                revenueTokenAccount: poolConfig.revenueTokenAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        initRevenueTokenAccountInstruction = _a.sent();
+                        instructions.push(initRevenueTokenAccountInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_25 = _a.sent();
+                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_25);
+                        throw err_25;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
         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_25;
+            var preInstructions, instructions, postInstructions, additionalSigners, userTokenAccount, _a, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndClaimInstruction, err_26;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -5384,9 +5346,9 @@ var PerpetualsClient = (function () {
                         instructions.push(burnAndClaimInstruction);
                         return [3, 8];
                     case 7:
-                        err_25 = _b.sent();
-                        console.log("perpClient burnAndClaimInstruction error:: ", err_25);
-                        throw err_25;
+                        err_26 = _b.sent();
+                        console.log("perpClient burnAndClaimInstruction error:: ", err_26);
+                        throw err_26;
                     case 8: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5395,7 +5357,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_26;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndStakeInstruction, err_27;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5446,9 +5408,9 @@ var PerpetualsClient = (function () {
                         instructions.push(burnAndStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_26 = _a.sent();
-                        console.log("perpClient burnAndStakeInstruction error:: ", err_26);
-                        throw err_26;
+                        err_27 = _a.sent();
+                        console.log("perpClient burnAndStakeInstruction error:: ", err_27);
+                        throw err_27;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5457,7 +5419,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_27;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_28;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5498,9 +5460,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositTokenStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_27 = _a.sent();
-                        console.log("perpClient depositStakingInstruction error:: ", err_27);
-                        throw err_27;
+                        err_28 = _a.sent();
+                        console.log("perpClient depositStakingInstruction error:: ", err_28);
+                        throw err_28;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5509,7 +5471,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_28;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_29;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5538,9 +5500,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_28 = _a.sent();
-                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_28);
-                        throw err_28;
+                        err_29 = _a.sent();
+                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_29);
+                        throw err_29;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5549,7 +5511,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_29;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, unstakeTokenInstantInstruction, err_30;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5589,9 +5551,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenInstantInstruction);
                         return [3, 5];
                     case 4:
-                        err_29 = _a.sent();
-                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_29);
-                        throw err_29;
+                        err_30 = _a.sent();
+                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_30);
+                        throw err_30;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5600,7 +5562,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_30;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_31;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5640,9 +5602,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawTokenInstruction);
                         return [3, 5];
                     case 4:
-                        err_30 = _a.sent();
-                        console.log("perpClient withdrawTokenInstruction error:: ", err_30);
-                        throw err_30;
+                        err_31 = _a.sent();
+                        console.log("perpClient withdrawTokenInstruction error:: ", err_31);
+                        throw err_31;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5651,7 +5613,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_31;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeRequestInstruction, err_32;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5680,9 +5642,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelUnstakeRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_31 = _a.sent();
-                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_31);
-                        throw err_31;
+                        err_32 = _a.sent();
+                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_32);
+                        throw err_32;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5690,8 +5652,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.distributeTokenReward = function (amount, epochCount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, fundingTokenAccount, distributeTokenRewardInstruction, err_32;
+        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;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5703,7 +5665,9 @@ var PerpetualsClient = (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
+                        rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
                         fundingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.tokenMint, publicKey, true);
+                        revenueFundingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                         return [4, this.program.methods
                                 .distributeTokenReward({
                                 amount: amount,
@@ -5727,9 +5691,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_32 = _a.sent();
-                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_32);
-                        throw err_32;
+                        err_33 = _a.sent();
+                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_33);
+                        throw err_33;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5738,7 +5702,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_33;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_34;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5770,9 +5734,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_33 = _a.sent();
-                        console.log("perpClient setTokenRewardInstruction error:: ", err_33);
-                        throw err_33;
+                        err_34 = _a.sent();
+                        console.log("perpClient setTokenRewardInstruction error:: ", err_34);
+                        throw err_34;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5780,14 +5744,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_34;
-                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_35;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5831,9 +5791,68 @@ var PerpetualsClient = (function () {
                             instructions.push(collectTokenRewardInstruction);
                             return [3, 6];
                         case 5:
-                            err_34 = _b.sent();
-                            console.log("perpClient collectTokenRewardInstruction error:: ", err_34);
-                            throw err_34;
+                            err_35 = _b.sent();
+                            console.log("perpClient collectTokenRewardInstruction error:: ", err_35);
+                            throw err_35;
+                        case 6: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
+        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_36;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 5, , 6]);
+                            rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
+                            tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
+                            userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, owner, true);
+                            _a = createUserATA;
+                            if (!_a) return [3, 3];
+                            return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                        case 2:
+                            _a = !(_b.sent());
+                            _b.label = 3;
+                        case 3:
+                            if (_a) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userTokenAccount, publicKey, poolConfig.tokenMint));
+                            }
+                            return [4, this.program.methods
+                                    .collectRevenue({})
+                                    .accounts({
+                                    owner: owner,
+                                    receivingRevenueAccount: userTokenAccount,
+                                    perpetuals: this.perpetuals.publicKey,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    tokenVault: poolConfig.tokenVault,
+                                    revenueTokenAccount: poolConfig.revenueTokenAccount,
+                                    tokenStakeAccount: tokenStakeAccount,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId
+                                })
+                                    .instruction()];
+                        case 4:
+                            collectRevenueInstruction = _b.sent();
+                            instructions.push(collectRevenueInstruction);
+                            return [3, 6];
+                        case 5:
+                            err_36 = _b.sent();
+                            console.log("perpClient collectRevenueInstruction error:: ", err_36);
+                            throw err_36;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5843,7 +5862,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_35;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_37;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5871,9 +5890,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenStakeLevelInstruction);
                         return [3, 4];
                     case 3:
-                        err_35 = _a.sent();
-                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_35);
-                        throw err_35;
+                        err_37 = _a.sent();
+                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_37);
+                        throw err_37;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5882,7 +5901,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_36;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, nftTransferAuthority, initRewardVault, err_38;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5919,9 +5938,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_36 = _a.sent();
-                        console.log("perpClient InitRewardVault error:: ", err_36);
-                        throw err_36;
+                        err_38 = _a.sent();
+                        console.log("perpClient InitRewardVault error:: ", err_38);
+                        throw err_38;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5930,7 +5949,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_37;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_39;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5961,9 +5980,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 4];
                     case 3:
-                        err_37 = _a.sent();
-                        console.log("perpClient distributeReward error:: ", err_37);
-                        throw err_37;
+                        err_39 = _a.sent();
+                        console.log("perpClient distributeReward error:: ", err_39);
+                        throw err_39;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5971,14 +5990,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_38;
-                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_40;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6028,8 +6043,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectNftReward);
                             return [3, 6];
                         case 5:
-                            err_38 = _b.sent();
-                            throw err_38;
+                            err_40 = _b.sent();
+                            throw err_40;
                         case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners
@@ -6038,14 +6053,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_39;
-                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_41;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6109,9 +6120,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_39 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_39);
-                            throw err_39;
+                            err_41 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_41);
+                            throw err_41;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6121,7 +6132,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_40;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, positionAccount, instructions, additionalSigners, setTriggerPrice, err_42;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6160,9 +6171,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTriggerPrice);
                         return [3, 4];
                     case 3:
-                        err_40 = _a.sent();
-                        console.log("perpClient setTriggerPrice error:: ", err_40);
-                        throw err_40;
+                        err_42 = _a.sent();
+                        console.log("perpClient setTriggerPrice error:: ", err_42);
+                        throw err_42;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6170,16 +6181,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_41;
-                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_43;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6240,9 +6247,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 7];
                         case 6:
-                            err_41 = _b.sent();
-                            console.log("perpClient forceClosePosition error:: ", err_41);
-                            throw err_41;
+                            err_43 = _b.sent();
+                            console.log("perpClient forceClosePosition error:: ", err_43);
+                            throw err_43;
                         case 7: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6251,15 +6258,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_42;
-                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_44;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -6364,9 +6367,9 @@ var PerpetualsClient = (function () {
                             instructions.push(placeLimitOrder);
                             return [3, 11];
                         case 10:
-                            err_42 = _c.sent();
-                            console.log("perpClient placeLimitOrder error:: ", err_42);
-                            throw err_42;
+                            err_44 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_44);
+                            throw err_44;
                         case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6375,15 +6378,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_43;
-                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_45;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6471,9 +6470,9 @@ var PerpetualsClient = (function () {
                             instructions.push(editLimitOrder);
                             return [3, 8];
                         case 7:
-                            err_43 = _b.sent();
-                            console.log("perpClient editLimitOrder error:: ", err_43);
-                            throw err_43;
+                            err_45 = _b.sent();
+                            console.log("perpClient editLimitOrder error:: ", err_45);
+                            throw err_45;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6482,16 +6481,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_44;
-                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_46;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -6540,9 +6535,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitOrder);
                             return [3, 4];
                         case 3:
-                            err_44 = _a.sent();
-                            console.log("perpClient executeLimitOrder error:: ", err_44);
-                            throw err_44;
+                            err_46 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_46);
+                            throw err_46;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6551,16 +6546,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_45;
-                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_47;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -6612,9 +6603,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitWithSwap);
                             return [3, 4];
                         case 3:
-                            err_45 = _a.sent();
-                            console.log("perpClient executeLimitWithSwap error:: ", err_45);
-                            throw err_45;
+                            err_47 = _a.sent();
+                            console.log("perpClient executeLimitWithSwap error:: ", err_47);
+                            throw err_47;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6624,7 +6615,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_46;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_48;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6672,9 +6663,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_46 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_46);
-                        throw err_46;
+                        err_48 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_48);
+                        throw err_48;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6683,7 +6674,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_47;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_49;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6730,9 +6721,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_47 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_47);
-                        throw err_47;
+                        err_49 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_49);
+                        throw err_49;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6741,7 +6732,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_48;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_50;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6774,9 +6765,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_48 = _a.sent();
-                        console.log("perpClient cancelTriggerOrder error:: ", err_48);
-                        throw err_48;
+                        err_50 = _a.sent();
+                        console.log("perpClient cancelTriggerOrder error:: ", err_50);
+                        throw err_50;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6785,7 +6776,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_49;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_51;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6816,9 +6807,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelAllTriggerOrders);
                         return [3, 4];
                     case 3:
-                        err_49 = _a.sent();
-                        console.log("perpClient cancelAllTriggerOrders error:: ", err_49);
-                        throw err_49;
+                        err_51 = _a.sent();
+                        console.log("perpClient cancelAllTriggerOrders error:: ", err_51);
+                        throw err_51;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6826,20 +6817,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_50;
-                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_52;
+                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); });
@@ -6850,9 +6837,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:
@@ -6861,8 +6848,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));
@@ -6872,20 +6859,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,
@@ -6930,13 +6917,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_50 = _e.sent();
-                            console.log("perpClient executeTriggerWithSwap error:: ", err_50);
-                            throw err_50;
+                            err_52 = _d.sent();
+                            console.log("perpClient executeTriggerWithSwap error:: ", err_52);
+                            throw err_52;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6945,18 +6932,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_51;
-                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_53;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -7022,9 +7005,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerOrder);
                             return [3, 8];
                         case 7:
-                            err_51 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_51);
-                            throw err_51;
+                            err_53 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_53);
+                            throw err_53;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -7034,7 +7017,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_52;
+            var payerPubkey, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_54;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7064,9 +7047,9 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_52 = _a.sent();
-                        console.log("perpClient migrateTriggerOrder error:: ", err_52);
-                        throw err_52;
+                        err_54 = _a.sent();
+                        console.log("perpClient migrateTriggerOrder error:: ", err_54);
+                        throw err_54;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7075,7 +7058,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.getPositionData = function (position, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_53;
+            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_55;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7104,15 +7087,15 @@ var PerpetualsClient = (function () {
                         console.log(getPositionData);
                         return [2, getPositionData];
                     case 3:
-                        err_53 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_53);
-                        throw err_53;
+                        err_55 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_55);
+                        throw err_55;
                     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_54;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_56;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7133,9 +7116,8 @@ var PerpetualsClient = (function () {
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
-                                pool: poolConfig.poolAddress,
-                                custody: custodyConfig.custodyAccount,
-                                custodyTokenAccount: custodyConfig.tokenAccount,
+                                protocol: poolConfig.protocol,
+                                protocolTokenAccount: poolConfig.protocolTokenAccount,
                                 receivingTokenAccount: receivingTokenAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
                             })
@@ -7145,9 +7127,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_54 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_54);
-                        throw err_54;
+                        err_56 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_56);
+                        throw err_56;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7155,8 +7137,80 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
+        this.moveProtocolFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_57;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        custodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
+                        instructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .moveProtocolFees({})
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: this.authority.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                tokenVault: poolConfig.tokenVault,
+                                pool: poolConfig.poolAddress,
+                                custody: custodyConfig.custodyAccount,
+                                custodyTokenAccount: custodyConfig.tokenAccount,
+                                revenueTokenAccount: poolConfig.revenueTokenAccount,
+                                protocol: poolConfig.protocol,
+                                protocolTokenAccount: poolConfig.protocolTokenAccount,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
+                            })
+                                .instruction()];
+                    case 2:
+                        moveProtocolFeesIx = _a.sent();
+                        instructions.push(moveProtocolFeesIx);
+                        return [3, 4];
+                    case 3:
+                        err_57 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_57);
+                        throw err_57;
+                    case 4: return [2, {
+                            instructions: __spreadArray([], instructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setProtocolFeeShareBps = function (feeShareBps, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, setProtocolFeeShareBpsIx, err_58;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        publicKey = this.provider.wallet.publicKey;
+                        return [4, this.program.methods
+                                .setProtocolFeeShare({
+                                feeShareBps: feeShareBps
+                            })
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                protocol: poolConfig.protocol,
+                            })
+                                .instruction()];
+                    case 1:
+                        setProtocolFeeShareBpsIx = _a.sent();
+                        return [2, setProtocolFeeShareBpsIx];
+                    case 2:
+                        err_58 = _a.sent();
+                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_58);
+                        throw err_58;
+                    case 3: return [2];
+                }
+            });
+        }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_55;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_59;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7183,9 +7237,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_55 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_55);
-                        throw err_55;
+                        err_59 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_59);
+                        throw err_59;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7194,7 +7248,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_56;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_60;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -7254,9 +7308,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_56 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_56);
-                        throw err_56;
+                        err_60 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_60);
+                        throw err_60;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7265,7 +7319,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_57;
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_61;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7298,9 +7352,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_57 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_57);
-                        throw err_57;
+                        err_61 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_61);
+                        throw err_61;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7308,18 +7362,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_58;
-                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_62;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -7336,8 +7386,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,
@@ -7349,8 +7399,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,
@@ -7359,26 +7409,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();
@@ -7402,12 +7452,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,
@@ -7436,12 +7486,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_58 = _f.sent();
-                            console.log("perpClient addCompoundingLiquidity error:: ", err_58);
+                            err_62 = _e.sent();
+                            console.log("perpClient addCompoundingLiquidity error:: ", err_62);
                             return [3, 10];
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -7451,18 +7501,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_59;
-                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_63;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -7499,19 +7545,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,
@@ -7523,8 +7569,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,
@@ -7532,9 +7578,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,
@@ -7563,12 +7609,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_59 = _f.sent();
-                            console.log("perpClient removeCompoundingLiquidity error:: ", err_59);
+                            err_63 = _e.sent();
+                            console.log("perpClient removeCompoundingLiquidity error:: ", err_63);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -7578,16 +7624,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_60;
-                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_64;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -7602,8 +7644,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));
@@ -7615,8 +7657,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({
@@ -7629,8 +7671,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,
@@ -7642,17 +7684,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
@@ -7678,12 +7720,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_60 = _g.sent();
-                            console.log("perpClient migrateStake error:: ", err_60);
+                            err_64 = _f.sent();
+                            console.log("perpClient migrateStake error:: ", err_64);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -7694,7 +7736,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_61;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_65;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -7766,8 +7808,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_61 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_61);
+                        err_65 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_65);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -7776,16 +7818,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_62;
-                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_66;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             instructions = [];
                             additionalSigners = [];
@@ -7794,8 +7832,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,
@@ -7807,17 +7845,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({
@@ -7836,12 +7874,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_62 = _e.sent();
-                            console.log("perpClient compoundingFee error:: ", err_62);
+                            err_66 = _d.sent();
+                            console.log("perpClient compoundingFee error:: ", err_66);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -7852,7 +7890,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_63;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_67;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7890,8 +7928,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_63 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_63);
+                        err_67 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_67);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -8001,9 +8039,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))];
@@ -8012,9 +8050,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))];