flash-sdk 2.52.3 → 2.54.0

package/dist/PerpetualsClient.js

@@ -1816,15 +1816,11 @@ var PerpetualsClient = (function () {
             }
             return finalIndexPriceAtT1.toString();
         };
-        this.getUserClaimableRevenueAmount = function (POOL_CONFIG_1, userPublicKey_1) {
-            var args_1 = [];
-            for (var _i = 2; _i < arguments.length; _i++) {
-                args_1[_i - 2] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([POOL_CONFIG_1, userPublicKey_1], args_1, true), void 0, function (POOL_CONFIG, userPublicKey, enableDebuglogs) {
+        this.getUserClaimableRevenueAmount = function (POOL_CONFIG, userPublicKey, enableDebuglogs) {
+            if (enableDebuglogs === void 0) { enableDebuglogs = false; }
+            return __awaiter(_this, void 0, void 0, function () {
                 var fafTokenVaultPk, fafTokenVaultAccountInfo, fafTokenVaultAccount, fafTokenVault, tokenStakeAccount, accountInfo, fafStakeData, tokenStakeFafAccount, activeStakeAmount, revenuePerFafStaked, revenueWatermark, revenueSnapshot, unclaimedRevenue, revenueAmount;
                 var _a, _b, _c, _d;
-                if (enableDebuglogs === void 0) { enableDebuglogs = false; }
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -1981,38 +1977,34 @@ 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 custodies, custodyMetas, marketMetas, _a, custodies_5, token, _b, custodies_6, custody, _c, _d, market, depositCustodyConfig, transaction, result, index, res;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_e) {
-                    switch (_e.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 custodies, custodyMetas, marketMetas, _i, custodies_5, token, _a, custodies_6, custody, _b, _c, market, depositCustodyConfig, transaction, result, index, res;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             custodies = POOL_CONFIG.custodies;
                             custodyMetas = [];
                             marketMetas = [];
-                            for (_a = 0, custodies_5 = custodies; _a < custodies_5.length; _a++) {
-                                token = custodies_5[_a];
+                            for (_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,
@@ -2035,10 +2027,10 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
                                     .transaction()];
                         case 1:
-                            transaction = _e.sent();
+                            transaction = _d.sent();
                             return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
                         case 2:
-                            result = _e.sent();
+                            result = _d.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddLiquidityAmountAndFee'; });
                             res = this.viewHelper.decodeLogs(result, index, 'getAddLiquidityAmountAndFee');
                             return [2, {
@@ -2049,38 +2041,34 @@ 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 custodies, custodyMetas, marketMetas, _a, custodies_7, token, _b, custodies_8, custody, _c, _d, market, removeCustodyConfig, transaction, result, index, res;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_e) {
-                    switch (_e.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 custodies, custodyMetas, marketMetas, _i, custodies_7, token, _a, custodies_8, custody, _b, _c, market, removeCustodyConfig, transaction, result, index, res;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             custodies = POOL_CONFIG.custodies;
                             custodyMetas = [];
                             marketMetas = [];
-                            for (_a = 0, custodies_7 = custodies; _a < custodies_7.length; _a++) {
-                                token = custodies_7[_a];
+                            for (_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,
@@ -2103,10 +2091,10 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
                                     .transaction()];
                         case 1:
-                            transaction = _e.sent();
+                            transaction = _d.sent();
                             return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
                         case 2:
-                            result = _e.sent();
+                            result = _d.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveLiquidityAmountAndFee'; });
                             if (result.value.err) {
                                 return [2, {
@@ -2182,38 +2170,34 @@ 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 custodies, custodyMetas, marketMetas, _a, custodies_11, token, _b, custodies_12, custody, _c, _d, market, depositCustodyConfig, rewardCustody, transaction, result, index, res;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_e) {
-                    switch (_e.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 custodies, custodyMetas, marketMetas, _i, custodies_11, token, _a, custodies_12, custody, _b, _c, market, depositCustodyConfig, rewardCustody, transaction, result, index, res;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             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,
@@ -2240,10 +2224,10 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
                                     .transaction()];
                         case 1:
-                            transaction = _e.sent();
+                            transaction = _d.sent();
                             return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
                         case 2:
-                            result = _e.sent();
+                            result = _d.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddCompoundingLiquidityAmountAndFee'; });
                             res = this.viewHelper.decodeLogs(result, index, 'getAddCompoundingLiquidityAmountAndFee');
                             return [2, {
@@ -2254,38 +2238,34 @@ 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 custodies, custodyMetas, marketMetas, _a, custodies_13, token, _b, custodies_14, custody, _c, _d, market, removeCustodyConfig, rewardCustody, transaction, result, index, res;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                return __generator(this, function (_e) {
-                    switch (_e.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 custodies, custodyMetas, marketMetas, _i, custodies_13, token, _a, custodies_14, custody, _b, _c, market, removeCustodyConfig, rewardCustody, transaction, result, index, res;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             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,
@@ -2312,10 +2292,10 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
                                     .transaction()];
                         case 1:
-                            transaction = _e.sent();
+                            transaction = _d.sent();
                             return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
                         case 2:
-                            result = _e.sent();
+                            result = _d.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveCompoundingLiquidityAmountAndFee'; });
                             if (result.value.err) {
                                 return [2, {
@@ -2496,45 +2476,40 @@ 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) {
-                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; }
+        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, collateralToken, marketAccount, userCollateralTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, params, instruction;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            collateralToken = poolConfig.getTokenFromSymbol(collateralSymbol);
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true)];
-                        case 1:
-                            userCollateralTokenAccount = _c.sent();
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true, collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            if (!(collateralSymbol == 'SOL')) return [3, 4];
+                            if (!(collateralSymbol == 'SOL')) return [3, 3];
                             console.log("collateralSymbol === SOL", collateralSymbol);
                             lamports = collateralWithfee.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
-                            if (!!skipBalanceChecks) return [3, 3];
+                            if (!!skipBalanceChecks) return [3, 2];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 2:
+                        case 1:
                             unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _c.label = 3;
-                        case 3:
+                            _c.label = 2;
+                        case 2:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -2552,23 +2527,23 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 7];
-                        case 4:
-                            if (!!skipBalanceChecks) return [3, 7];
+                            return [3, 6];
+                        case 3:
+                            if (!!skipBalanceChecks) return [3, 6];
                             return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
-                        case 5:
+                        case 4:
                             if (!(_c.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userCollateralTokenAccount)];
-                        case 6:
+                        case 5:
                             tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_c.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(collateralWithfee)) {
                                 throw "Insufficient Funds need more ".concat(collateralWithfee.sub(tokenAccountBalance), " tokens");
                             }
-                            _c.label = 7;
-                        case 7:
+                            _c.label = 6;
+                        case 6:
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             params = {
                                 priceWithSlippage: priceWithSlippage,
@@ -2596,11 +2571,12 @@ var PerpetualsClient = (function () {
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
                                     transferAuthority: this.authority.publicKey,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    fundingMint: collateralCustodyConfig.mintKey
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
                                     .instruction()];
-                        case 8:
+                        case 7:
                             instruction = _c.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -2611,19 +2587,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_1;
-                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:
@@ -2657,7 +2629,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 5];
                         case 2:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             _a = createUserATA;
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -2666,7 +2638,7 @@ var PerpetualsClient = (function () {
                             _b.label = 4;
                         case 4:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             _b.label = 5;
                         case 5:
@@ -2696,7 +2668,7 @@ var PerpetualsClient = (function () {
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
                                     .instruction()];
@@ -2720,18 +2692,14 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.swapAndOpen = function (targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, minCollateralAmountOut_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1) {
-            var args_1 = [];
-            for (var _i = 10; _i < arguments.length; _i++) {
-                args_1[_i - 10] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, minCollateralAmountOut_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, minCollateralAmountOut, priceWithSlippage, sizeAmount, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, userInputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, userOutputTokenAccount, tokenAccountBalance, _b, userOutputTokenAccount, inx, err_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 (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+        this.swapAndOpen = function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, minCollateralAmountOut, priceWithSlippage, sizeAmount, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, userInputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, targetToken, userInputTokenAccount, userInputToken, lamports, unWrappedSolBalance, _a, userOutputTokenAccount, tokenAccountBalance, _b, userOutputTokenAccount, rebateMintAccount, inx, err_3;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -2757,6 +2725,8 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
+                            targetToken = poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol);
+                            userInputToken = poolConfig.getTokenFromSymbol(userInputTokenSymbol);
                             if (!(userInputTokenSymbol == 'SOL')) return [3, 5];
                             console.log("inputSymbol === SOL", userInputTokenSymbol);
                             lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
@@ -2788,7 +2758,7 @@ var PerpetualsClient = (function () {
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
                             if (!!poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey.equals(spl_token_1.NATIVE_MINT)) return [3, 4];
-                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, publicKey, true);
+                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
                         case 3:
                             if (!(_c.sent())) {
@@ -2797,7 +2767,7 @@ var PerpetualsClient = (function () {
                             _c.label = 4;
                         case 4: return [3, 10];
                         case 5:
-                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey, publicKey, true);
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(userInputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             if (!!skipBalanceChecks) return [3, 8];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 6:
@@ -2813,15 +2783,22 @@ var PerpetualsClient = (function () {
                             }
                             _c.label = 8;
                         case 8:
-                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, publicKey, true);
+                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
                         case 9:
                             if (!(_c.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             _c.label = 10;
                         case 10:
-                            _c.trys.push([10, 12, , 13]);
+                            rebateMintAccount = {
+                                pubkey: collateralCustodyConfig.mintKey,
+                                isSigner: false,
+                                isWritable: false
+                            };
+                            _c.label = 11;
+                        case 11:
+                            _c.trys.push([11, 13, , 14]);
                             return [4, this.program.methods
                                     .swapAndOpen({
                                     amountIn: amountIn,
@@ -2848,22 +2825,24 @@ var PerpetualsClient = (function () {
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    fundingMint: userInputCustodyConfig.mintKey,
+                                    fundingTokenProgram: targetToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
                                     .instruction()];
-                        case 11:
+                        case 12:
                             inx = _c.sent();
                             instructions.push(inx);
-                            return [3, 13];
-                        case 12:
+                            return [3, 14];
+                        case 13:
                             err_3 = _c.sent();
                             console.error("perpClient SwapAndOpen error:: ", err_3);
                             throw err_3;
-                        case 13: return [2, {
+                        case 14: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -2871,17 +2850,13 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.closeAndSwap = function (targetTokenSymbol_1, userOutputTokenSymbol_1, collateralTokenSymbol_1, minSwapAmountOut_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1) {
-            var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, userOutputTokenSymbol_1, collateralTokenSymbol_1, minSwapAmountOut_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, userOutputTokenSymbol, collateralTokenSymbol, minSwapAmountOut, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, ephemeralSignerPubkey) {
-                var publicKey, userOutputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, inx, err_4;
-                if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
-                if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+        this.closeAndSwap = function (targetTokenSymbol, userOutputTokenSymbol, collateralTokenSymbol, minSwapAmountOut, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount, ephemeralSignerPubkey) {
+            if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
+            if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
+            if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, userOutputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, collateralToken, userOutputToken, lamports, userCollateralTokenAccount, rebateMintAccount, inx, err_4;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -2907,6 +2882,8 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
+                            collateralToken = poolConfig.getTokenFromSymbol(collateralTokenSymbol);
+                            userOutputToken = poolConfig.getTokenFromSymbol(userOutputTokenSymbol);
                             if (!(userOutputTokenSymbol == 'SOL')) return [3, 1];
                             console.log("outputSymbol === SOL", userOutputTokenSymbol);
                             lamports = (this.minimumBalanceForRentExemptAccountLamports);
@@ -2928,26 +2905,30 @@ var PerpetualsClient = (function () {
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
                             additionalSigners.push(wrappedSolAccount);
-                            return [3, 4];
-                        case 1: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true)];
-                        case 2:
-                            userReceivingTokenAccount = _a.sent();
+                            return [3, 3];
+                        case 1:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(userOutputToken.mintKey, publicKey, true, userOutputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 3:
+                        case 2:
                             if (!(_a.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, userOutputToken.mintKey, userOutputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
-                            _a.label = 4;
-                        case 4:
-                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralTokenSymbol).mintKey, publicKey, true);
+                            _a.label = 3;
+                        case 3:
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralToken.mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
-                        case 5:
+                        case 4:
                             if (!(_a.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralTokenSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralToken.mintKey, userOutputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
-                            _a.label = 6;
-                        case 6:
-                            _a.trys.push([6, 8, , 9]);
+                            rebateMintAccount = {
+                                pubkey: collateralCustodyConfig.mintKey,
+                                isSigner: false,
+                                isWritable: false
+                            };
+                            _a.label = 5;
+                        case 5:
+                            _a.trys.push([5, 7, , 8]);
                             return [4, this.program.methods
                                     .closeAndSwap({
                                     priceWithSlippage: priceWithSlippage,
@@ -2972,22 +2953,25 @@ var PerpetualsClient = (function () {
                                     dispensingCustody: userOutputCustodyConfig.custodyAccount,
                                     dispensingOracleAccount: this.useExtOracleAccount ? userOutputCustodyConfig.extOracleAccount : userOutputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    receivingMint: userOutputCustodyConfig.mintKey,
+                                    receivingTokenProgram: userOutputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    collateralMint: collateralCustodyConfig.mintKey,
+                                    collateralTokenProgram: collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
                                     .instruction()];
-                        case 7:
+                        case 6:
                             inx = _a.sent();
                             instructions.push(inx);
-                            return [3, 9];
-                        case 8:
+                            return [3, 8];
+                        case 7:
                             err_4 = _a.sent();
                             console.error("perpClient CloseAndSwap error:: ", err_4);
                             throw err_4;
-                        case 9: return [2, {
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -2995,15 +2979,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:
@@ -3081,9 +3061,10 @@ var PerpetualsClient = (function () {
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                fundingMint: collateralCustodyConfig.mintKey
                             })
                                 .instruction()];
                         case 7:
@@ -3097,15 +3078,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:
@@ -3156,7 +3133,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 6];
                         case 3:
-                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true);
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true, poolConfig.getTokenFromSymbol(inputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             if (!!skipBalanceChecks) return [3, 6];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 4:
@@ -3172,11 +3149,11 @@ var PerpetualsClient = (function () {
                             }
                             _c.label = 6;
                         case 6:
-                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true);
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
                         case 7:
                             if (!(_c.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralCustodyConfig.mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralCustodyConfig.mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.program.methods.swapAndAddCollateral({
@@ -3216,16 +3193,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_2;
-                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:
@@ -3269,7 +3242,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 5];
                         case 2:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             _a = createUserATA;
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -3278,7 +3251,7 @@ var PerpetualsClient = (function () {
                             _b.label = 4;
                         case 4:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             _b.label = 5;
                         case 5:
@@ -3301,9 +3274,10 @@ var PerpetualsClient = (function () {
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    receivingMint: collateralCustodyConfig.mintKey
                                 })
                                     .instruction()];
                         case 6:
@@ -3326,14 +3300,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:
@@ -3370,19 +3340,19 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 3];
                         case 1:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                         case 2:
                             if (!(_a.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(outputSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(outputSymbol).mintKey, poolConfig.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             _a.label = 3;
                         case 3:
-                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
                         case 4:
                             if (!(_a.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
@@ -3409,7 +3379,7 @@ var PerpetualsClient = (function () {
                                     dispensingCustody: outputCustodyConfig.custodyAccount,
                                     dispensingOracleAccount: this.useExtOracleAccount ? outputCustodyConfig.extOracleAccount : outputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
@@ -3426,16 +3396,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:
@@ -3472,7 +3438,7 @@ var PerpetualsClient = (function () {
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
@@ -3490,16 +3456,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:
@@ -3536,7 +3498,7 @@ var PerpetualsClient = (function () {
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
@@ -3554,17 +3516,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_5;
-                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, payToken, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, tokenAccountBalance, _e, instruction, err_5;
+                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); });
@@ -3575,16 +3533,17 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _g.label = 1;
+                            payToken = poolConfig.getTokenFromSymbol(payTokenSymbol);
+                            _f.label = 1;
                         case 1:
-                            _g.trys.push([1, 10, , 11]);
-                            userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(payTokenCustodyConfig.mintKey, publicKey, true);
+                            _f.trys.push([1, 10, , 11]);
+                            userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(payTokenCustodyConfig.mintKey, publicKey, true, payToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             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,
@@ -3596,8 +3555,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,
@@ -3606,21 +3565,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();
@@ -3644,17 +3603,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,
@@ -3674,16 +3633,18 @@ var PerpetualsClient = (function () {
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 program: this.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                fundingMint: payTokenCustodyConfig.mintKey,
+                                fundingTokenProgram: payToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                 .instruction()];
                         case 9:
-                            instruction = _g.sent();
+                            instruction = _f.sent();
                             instructions.push(instruction);
                             return [3, 11];
                         case 10:
-                            err_5 = _g.sent();
+                            err_5 = _f.sent();
                             console.error("perpClient addLiquidity error:: ", err_5);
                             throw err_5;
                         case 11: return [2, {
@@ -3694,18 +3655,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, inputToken, 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 = [];
@@ -3715,6 +3672,7 @@ var PerpetualsClient = (function () {
                             lpTokenMint = poolConfig.stakedLpTokenMint;
                             inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
                             lpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(lpTokenMint, publicKey, true);
+                            inputToken = poolConfig.getTokenFromSymbol(inputSymbol);
                             flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
                             poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
                             if (!(inputSymbol == 'SOL')) return [3, 4];
@@ -3725,14 +3683,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) {
@@ -3754,27 +3712,27 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 7];
                         case 4:
-                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true);
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true, inputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             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,
@@ -3786,8 +3744,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,
@@ -3814,12 +3772,14 @@ var PerpetualsClient = (function () {
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    fundingMint: inputCustodyConfig.mintKey,
+                                    fundingTokenProgram: inputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                                 })
                                     .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),
@@ -3829,20 +3789,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_6;
-                if (closeLpATA === void 0) { closeLpATA = false; }
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
-                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, recieveToken, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, _d, removeLiquidityTx, closeInx, closeWsolATAIns, err_6;
+                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) {
@@ -3853,15 +3809,16 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _f.label = 1;
+                            recieveToken = poolConfig.getTokenFromSymbol(recieveTokenSymbol);
+                            _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,
@@ -3873,8 +3830,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,
@@ -3902,18 +3859,18 @@ 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];
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(recieveToken.mintKey, publicKey, true, recieveToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            _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) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey));
+                            if (_d) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, recieveToken.mintKey, recieveToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
-                            _f.label = 5;
+                            _e.label = 5;
                         case 5: return [4, this.program.methods
                                 .removeLiquidity({
                                 lpAmountIn: liquidityAmountIn,
@@ -3933,12 +3890,14 @@ var PerpetualsClient = (function () {
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 program: this.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                receivingMint: recieveTokenCustodyConfig.mintKey,
+                                receivingTokenProgram: recieveToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                 .instruction()];
                         case 6:
-                            removeLiquidityTx = _f.sent();
+                            removeLiquidityTx = _e.sent();
                             instructions.push(removeLiquidityTx);
                             if (closeLpATA) {
                                 closeInx = (0, spl_token_1.createCloseAccountInstruction)(stakedLpTokenAccount, publicKey, publicKey);
@@ -3950,7 +3909,7 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 8];
                         case 7:
-                            err_6 = _f.sent();
+                            err_6 = _e.sent();
                             console.log("perpClient removeLiquidity error:: ", err_6);
                             throw err_6;
                         case 8: return [2, {
@@ -3999,54 +3958,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.createNftTradingAccount = function (nftMint, owner, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, createNftTradingAccountInstruction, err_8;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        publicKey = this.provider.wallet.publicKey;
-                        preInstructions = [];
-                        instructions = [];
-                        postInstructions = [];
-                        additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                            Buffer.from("trading"),
-                            nftMint.toBuffer(),
-                        ], this.programId)[0];
-                        metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        return [4, this.program.methods
-                                .createTradingAccount({
-                                collectionIndex: 1
-                            })
-                                .accounts({
-                                feePayer: publicKey,
-                                perpetuals: poolConfig.perpetuals,
-                                nftMint: nftMint,
-                                tradingAccount: nftTradingAccount,
-                                metadataAccount: metadataAccount,
-                                systemProgram: web3_js_1.SystemProgram.programId
-                            })
-                                .instruction()];
-                    case 2:
-                        createNftTradingAccountInstruction = _a.sent();
-                        instructions.push(createNftTradingAccountInstruction);
-                        return [3, 4];
-                    case 3:
-                        err_8 = _a.sent();
-                        console.log("perpClient createNftAccount error:: ", err_8);
-                        throw err_8;
-                    case 4: return [2, {
-                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
         this.updateNftAccount = function (nftMint, updateReferer, updateBooster, flpStakeAccounts) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, flpStakeAccountMetas, _i, flpStakeAccounts_1, flpStakeAccountPk, updateNftTradingAccountInstruction, err_9;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, flpStakeAccountMetas, _i, flpStakeAccounts_1, flpStakeAccountPk, updateNftTradingAccountInstruction, err_8;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4096,9 +4009,9 @@ var PerpetualsClient = (function () {
                         instructions.push(updateNftTradingAccountInstruction);
                         return [3, 5];
                     case 4:
-                        err_9 = _a.sent();
-                        console.log("perpClient updateNftAccount error:: ", err_9);
-                        throw err_9;
+                        err_8 = _a.sent();
+                        console.log("perpClient updateNftAccount error:: ", err_8);
+                        throw err_8;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4107,7 +4020,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.levelUp = function (poolConfig, nftMint, authorizationRulesAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, levelUpInstruction, err_10;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, levelUpInstruction, err_9;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4146,9 +4059,9 @@ var PerpetualsClient = (function () {
                         instructions.push(levelUpInstruction);
                         return [3, 4];
                     case 3:
-                        err_10 = _a.sent();
-                        console.log("perpClient levelUp error:: ", err_10);
-                        throw err_10;
+                        err_9 = _a.sent();
+                        console.log("perpClient levelUp error:: ", err_9);
+                        throw err_9;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4157,7 +4070,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.depositStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_11;
+            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_10;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4190,7 +4103,8 @@ var PerpetualsClient = (function () {
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId
+                                program: this.programId,
+                                lpTokenMint: poolConfig.stakedLpTokenMint,
                             })
                                 .instruction()];
                     case 3:
@@ -4198,9 +4112,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_11 = _a.sent();
-                        console.log("perpClient depositStaking error:: ", err_11);
-                        throw err_11;
+                        err_10 = _a.sent();
+                        console.log("perpClient depositStaking error:: ", err_10);
+                        throw err_10;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4209,7 +4123,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.refreshStakeWithAllFlpStakeAccounts = function (rewardSymbol, poolConfig, flpStakeAccountPks) { return __awaiter(_this, void 0, void 0, function () {
-            var rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_1, flpStakeAccountPk, refreshStakeInstruction, err_12;
+            var rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_1, flpStakeAccountPk, refreshStakeInstruction, err_11;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -4256,33 +4170,29 @@ var PerpetualsClient = (function () {
                         refreshStakeInstruction = _c.sent();
                         return [2, refreshStakeInstruction];
                     case 2:
-                        err_12 = _c.sent();
-                        console.log("perpClient refreshStaking error:: ", err_12);
-                        throw err_12;
+                        err_11 = _c.sent();
+                        console.log("perpClient refreshStaking error:: ", err_11);
+                        throw err_11;
                     case 3: return [2];
                 }
             });
         }); };
-        this.refreshStakeWithTokenStake = function (rewardSymbol_1, poolConfig_1, flpStakeAccountPk_1) {
-            var args_1 = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                args_1[_i - 3] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, flpStakeAccountPk_1], args_1, true), void 0, function (rewardSymbol, poolConfig, flpStakeAccountPk, userPublicKey) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _a, _b, custody, stakeAccountMetas, tokenStakeAccount, refreshStakeInstruction, err_13;
-                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_12;
+                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,
@@ -4314,25 +4224,21 @@ var PerpetualsClient = (function () {
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), stakeAccountMetas, true))
                                     .instruction()];
                         case 1:
-                            refreshStakeInstruction = _c.sent();
+                            refreshStakeInstruction = _b.sent();
                             return [2, refreshStakeInstruction];
                         case 2:
-                            err_13 = _c.sent();
-                            console.log("perpClient refreshStaking error:: ", err_13);
-                            throw err_13;
+                            err_12 = _b.sent();
+                            console.log("perpClient refreshStaking error:: ", err_12);
+                            throw err_12;
                         case 3: return [2];
                     }
                 });
             });
         };
-        this.unstakeInstant = function (rewardSymbol_1, unstakeAmount_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                args_1[_i - 3] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([rewardSymbol_1, unstakeAmount_1, poolConfig_1], args_1, true), void 0, function (rewardSymbol, unstakeAmount, poolConfig, userPublicKey) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _a, unstakeInstantInstruction, err_14;
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
+        this.unstakeInstant = function (rewardSymbol, unstakeAmount, poolConfig, userPublicKey) {
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _a, unstakeInstantInstruction, err_13;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -4383,9 +4289,9 @@ var PerpetualsClient = (function () {
                             instructions.push(unstakeInstantInstruction);
                             return [3, 6];
                         case 5:
-                            err_14 = _b.sent();
-                            console.log("perpClient unstakeInstant error:: ", err_14);
-                            throw err_14;
+                            err_13 = _b.sent();
+                            console.log("perpClient unstakeInstant error:: ", err_13);
+                            throw err_13;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4395,7 +4301,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.setFeeShareBps = function (poolConfig, flpStakeAccountPks) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, pool, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_2, flpStakeAccountPk, refreshStakeInstruction, err_15;
+            var publicKey, pool, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_2, flpStakeAccountPk, refreshStakeInstruction, err_14;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -4439,15 +4345,15 @@ var PerpetualsClient = (function () {
                         refreshStakeInstruction = _c.sent();
                         return [2, refreshStakeInstruction];
                     case 2:
-                        err_15 = _c.sent();
-                        console.log("perpClient refreshStaking error:: ", err_15);
-                        throw err_15;
+                        err_14 = _c.sent();
+                        console.log("perpClient refreshStaking error:: ", err_14);
+                        throw err_14;
                     case 3: return [2];
                 }
             });
         }); };
         this.unstakeRequest = function (unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_16;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_15;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4481,9 +4387,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_16 = _a.sent();
-                        console.log("perpClient unstakeRequest error:: ", err_16);
-                        throw err_16;
+                        err_15 = _a.sent();
+                        console.log("perpClient unstakeRequest error:: ", err_15);
+                        throw err_15;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4491,17 +4397,13 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.withdrawStake = function (poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args_1[_i - 1] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([poolConfig_1], args_1, true), void 0, function (poolConfig, pendingActivation, deactivated, createUserLPTA, userPublicKey) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_17;
-                if (pendingActivation === void 0) { pendingActivation = true; }
-                if (deactivated === void 0) { deactivated = true; }
-                if (createUserLPTA === void 0) { createUserLPTA = true; }
-                if (userPublicKey === void 0) { userPublicKey = undefined; }
+        this.withdrawStake = function (poolConfig, pendingActivation, deactivated, createUserLPTA, userPublicKey) {
+            if (pendingActivation === void 0) { pendingActivation = true; }
+            if (deactivated === void 0) { deactivated = true; }
+            if (createUserLPTA === void 0) { createUserLPTA = true; }
+            if (userPublicKey === void 0) { userPublicKey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_16;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -4552,9 +4454,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_17 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_17);
-                            throw err_17;
+                            err_16 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_16);
+                            throw err_16;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4563,14 +4465,10 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.collectStakeFees = function (rewardSymbol_1, poolConfig_1, tokenStakeAccount_1) {
-            var args_1 = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                args_1[_i - 3] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, tokenStakeAccount_1], args_1, true), void 0, function (rewardSymbol, poolConfig, tokenStakeAccount, createUserATA) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tokenStakeAccounts, withdrawStakeInstruction, err_18;
-                if (createUserATA === void 0) { createUserATA = true; }
+        this.collectStakeFees = function (rewardSymbol, poolConfig, tokenStakeAccount, createUserATA) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tokenStakeAccounts, withdrawStakeInstruction, err_17;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -4629,9 +4527,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_18 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_18);
-                            throw err_18;
+                            err_17 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_17);
+                            throw err_17;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4640,18 +4538,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_19;
-                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_18;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -4668,8 +4562,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,
@@ -4681,8 +4575,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,
@@ -4691,26 +4585,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();
@@ -4734,12 +4628,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,
@@ -4768,12 +4662,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_19 = _f.sent();
-                            console.log("perpClient addCompoundingLiquidity error:: ", err_19);
+                            err_18 = _e.sent();
+                            console.log("perpClient addCompoundingLiquidity error:: ", err_18);
                             return [3, 10];
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -4783,18 +4677,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_20;
-                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_19;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -4831,19 +4721,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,
@@ -4855,8 +4745,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,
@@ -4864,9 +4754,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,
@@ -4895,12 +4785,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_20 = _f.sent();
-                            console.log("perpClient removeCompoundingLiquidity error:: ", err_20);
+                            err_19 = _e.sent();
+                            console.log("perpClient removeCompoundingLiquidity error:: ", err_19);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -4910,16 +4800,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_21;
-                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_20;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -4934,8 +4820,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));
@@ -4947,8 +4833,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({
@@ -4961,8 +4847,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,
@@ -4974,17 +4860,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
@@ -5010,12 +4896,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_21 = _g.sent();
-                            console.log("perpClient migrateStake error:: ", err_21);
+                            err_20 = _f.sent();
+                            console.log("perpClient migrateStake error:: ", err_20);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5026,7 +4912,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_22;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_21;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -5098,8 +4984,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_22 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_22);
+                        err_21 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_21);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5108,16 +4994,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_23;
-                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_22;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             instructions = [];
                             additionalSigners = [];
@@ -5126,8 +5008,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,
@@ -5139,17 +5021,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({
@@ -5168,12 +5050,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_23 = _e.sent();
-                            console.log("perpClient compoundingFee error:: ", err_23);
+                            err_22 = _d.sent();
+                            console.log("perpClient compoundingFee error:: ", err_22);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -5184,7 +5066,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.burnAndClaim = function (owner, nftMint, poolConfig, createAta) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, userTokenAccount, _a, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndClaimInstruction, err_24;
+            var preInstructions, instructions, postInstructions, additionalSigners, userTokenAccount, _a, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndClaimInstruction, err_23;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -5248,9 +5130,9 @@ var PerpetualsClient = (function () {
                         instructions.push(burnAndClaimInstruction);
                         return [3, 8];
                     case 7:
-                        err_24 = _b.sent();
-                        console.log("perpClient burnAndClaimInstruction error:: ", err_24);
-                        throw err_24;
+                        err_23 = _b.sent();
+                        console.log("perpClient burnAndClaimInstruction error:: ", err_23);
+                        throw err_23;
                     case 8: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5259,7 +5141,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_25;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndStakeInstruction, err_24;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5310,9 +5192,9 @@ var PerpetualsClient = (function () {
                         instructions.push(burnAndStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_25 = _a.sent();
-                        console.log("perpClient burnAndStakeInstruction error:: ", err_25);
-                        throw err_25;
+                        err_24 = _a.sent();
+                        console.log("perpClient burnAndStakeInstruction error:: ", err_24);
+                        throw err_24;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5321,7 +5203,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_26;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_25;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5362,9 +5244,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositTokenStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_26 = _a.sent();
-                        console.log("perpClient depositStakingInstruction error:: ", err_26);
-                        throw err_26;
+                        err_25 = _a.sent();
+                        console.log("perpClient depositStakingInstruction error:: ", err_25);
+                        throw err_25;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5373,7 +5255,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_27;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_26;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5402,9 +5284,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_27 = _a.sent();
-                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_27);
-                        throw err_27;
+                        err_26 = _a.sent();
+                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_26);
+                        throw err_26;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5413,7 +5295,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_28;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, unstakeTokenInstantInstruction, err_27;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5453,9 +5335,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenInstantInstruction);
                         return [3, 5];
                     case 4:
-                        err_28 = _a.sent();
-                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_28);
-                        throw err_28;
+                        err_27 = _a.sent();
+                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_27);
+                        throw err_27;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5464,7 +5346,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_29;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_28;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5504,9 +5386,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawTokenInstruction);
                         return [3, 5];
                     case 4:
-                        err_29 = _a.sent();
-                        console.log("perpClient withdrawTokenInstruction error:: ", err_29);
-                        throw err_29;
+                        err_28 = _a.sent();
+                        console.log("perpClient withdrawTokenInstruction error:: ", err_28);
+                        throw err_28;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5515,7 +5397,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_30;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeRequestInstruction, err_29;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5544,9 +5426,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelUnstakeRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_30 = _a.sent();
-                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_30);
-                        throw err_30;
+                        err_29 = _a.sent();
+                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_29);
+                        throw err_29;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5554,14 +5436,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_31;
-                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_30;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5605,9 +5483,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectTokenRewardInstruction);
                             return [3, 6];
                         case 5:
-                            err_31 = _b.sent();
-                            console.log("perpClient collectTokenRewardInstruction error:: ", err_31);
-                            throw err_31;
+                            err_30 = _b.sent();
+                            console.log("perpClient collectTokenRewardInstruction error:: ", err_30);
+                            throw err_30;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5616,14 +5494,10 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.collectRevenue = function (owner_1, rewardSymbol_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                args_1[_i - 3] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([owner_1, rewardSymbol_1, poolConfig_1], args_1, true), void 0, function (owner, rewardSymbol, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_32;
-                if (createUserATA === void 0) { createUserATA = true; }
+        this.collectRevenue = function (owner, rewardSymbol, poolConfig, createUserATA) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_31;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5668,9 +5542,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectRevenueInstruction);
                             return [3, 6];
                         case 5:
-                            err_32 = _b.sent();
-                            console.log("perpClient collectRevenueInstruction error:: ", err_32);
-                            throw err_32;
+                            err_31 = _b.sent();
+                            console.log("perpClient collectRevenueInstruction error:: ", err_31);
+                            throw err_31;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5680,7 +5554,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_33;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, nftTransferAuthority, initRewardVault, err_32;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5717,9 +5591,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_33 = _a.sent();
-                        console.log("perpClient InitRewardVault error:: ", err_33);
-                        throw err_33;
+                        err_32 = _a.sent();
+                        console.log("perpClient InitRewardVault error:: ", err_32);
+                        throw err_32;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5728,7 +5602,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_34;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_33;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5759,9 +5633,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 4];
                     case 3:
-                        err_34 = _a.sent();
-                        console.log("perpClient distributeReward error:: ", err_34);
-                        throw err_34;
+                        err_33 = _a.sent();
+                        console.log("perpClient distributeReward error:: ", err_33);
+                        throw err_33;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5769,19 +5643,16 @@ 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_35;
-                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, rewardToken, rewardCustodyMint, instructions, additionalSigners, nftTokenAccount, metadataAccount, receivingTokenAccount, _a, rewardRecord, rewardVault, rewardTokenAccount, nftTransferAuthority, collectNftReward, err_34;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
+                            rewardToken = poolConfig.getTokenFromSymbol(rewardSymbol);
+                            rewardCustodyMint = rewardToken.mintKey;
                             instructions = [];
                             additionalSigners = [];
                             _b.label = 1;
@@ -5789,7 +5660,7 @@ var PerpetualsClient = (function () {
                             _b.trys.push([1, 5, , 6]);
                             nftTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(nftMint, publicKey, true);
                             metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
+                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             _a = createUserATA;
                             if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
@@ -5798,7 +5669,7 @@ var PerpetualsClient = (function () {
                             _b.label = 3;
                         case 3:
                             if (_a) {
-                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint));
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             rewardRecord = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_record"), nftMint.toBuffer()], this.programFbnftReward.programId)[0];
                             rewardVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_vault")], this.programFbnftReward.programId)[0];
@@ -5818,7 +5689,7 @@ var PerpetualsClient = (function () {
                                     rewardTokenAccount: rewardTokenAccount,
                                     transferAuthority: nftTransferAuthority,
                                     systemProgram: web3_js_1.SystemProgram.programId,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
                                     .instruction()];
                         case 4:
@@ -5826,8 +5697,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectNftReward);
                             return [3, 6];
                         case 5:
-                            err_35 = _b.sent();
-                            throw err_35;
+                            err_34 = _b.sent();
+                            throw err_34;
                         case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners
@@ -5836,20 +5707,17 @@ 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_36;
-                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, rewardToken, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, rewardVault, rewardTokenAccount, withdrawStakeInstruction, err_35;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
-                            rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
+                            rewardToken = poolConfig.getTokenFromSymbol(rewardSymbol);
+                            rewardCustodyMint = rewardToken.mintKey;
+                            rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(rewardToken.mintKey); });
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
@@ -5859,7 +5727,7 @@ var PerpetualsClient = (function () {
                             _b.trys.push([1, 5, , 6]);
                             pool = poolConfig.poolAddress;
                             flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), pool.toBuffer()], this.program.programId)[0];
-                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
+                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             _a = createUserATA;
                             if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
@@ -5907,9 +5775,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_36 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_36);
-                            throw err_36;
+                            err_35 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_35);
+                            throw err_35;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5919,7 +5787,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_37;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, positionAccount, instructions, additionalSigners, setTriggerPrice, err_36;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5958,9 +5826,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTriggerPrice);
                         return [3, 4];
                     case 3:
-                        err_37 = _a.sent();
-                        console.log("perpClient setTriggerPrice error:: ", err_37);
-                        throw err_37;
+                        err_36 = _a.sent();
+                        console.log("perpClient setTriggerPrice error:: ", err_36);
+                        throw err_36;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5968,16 +5836,12 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.forceClosePosition = function (positionAccount_2, 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_2, 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_38;
-                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_37;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5991,19 +5855,17 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 6, , 7]);
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, positionAccount.owner)];
-                        case 2:
-                            userReceivingTokenAccount = _b.sent();
+                            _b.trys.push([1, 5, , 6]);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, positionAccount.owner, false, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             _a = createUserATA;
-                            if (!_a) return [3, 4];
+                            if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 3:
+                        case 2:
                             _a = !(_b.sent());
-                            _b.label = 4;
-                        case 4:
+                            _b.label = 3;
+                        case 3:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, positionAccount.owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, positionAccount.owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             return [4, this.program.methods
                                     .forceClosePosition({
@@ -6026,22 +5888,23 @@ var PerpetualsClient = (function () {
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    receivingMint: collateralCustodyConfig.mintKey
                                 })
                                     .instruction()];
-                        case 5:
+                        case 4:
                             forceClosePosition = _b.sent();
                             instructions.push(forceClosePosition);
                             if (collateralSymbol == 'WSOL' && closeUsersWSOLATA) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, positionAccount.owner, positionAccount.owner);
                                 postInstructions.push(closeWsolATAIns);
                             }
-                            return [3, 7];
-                        case 6:
-                            err_38 = _b.sent();
-                            console.log("perpClient forceClosePosition error:: ", err_38);
-                            throw err_38;
-                        case 7: return [2, {
+                            return [3, 6];
+                        case 5:
+                            err_37 = _b.sent();
+                            console.log("perpClient forceClosePosition error:: ", err_37);
+                            throw err_37;
+                        case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -6049,15 +5912,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_39;
-                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_38;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -6067,30 +5926,28 @@ var PerpetualsClient = (function () {
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
                             receiveCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receiveSymbol).mintKey); });
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, publicKey)];
-                        case 1:
-                            userReserveTokenAccount = _c.sent();
+                            userReserveTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _c.label = 2;
-                        case 2:
-                            _c.trys.push([2, 10, , 11]);
-                            if (!(reserveSymbol == 'SOL')) return [3, 5];
+                            _c.label = 1;
+                        case 1:
+                            _c.trys.push([1, 9, , 10]);
+                            if (!(reserveSymbol == 'SOL')) return [3, 4];
                             console.log("reserveSymbol === SOL", reserveSymbol);
                             accCreationLamports = this.minimumBalanceForRentExemptAccountLamports;
                             lamports = reserveAmount.add(new anchor_1.BN(accCreationLamports));
-                            if (!!skipBalanceChecks) return [3, 4];
+                            if (!!skipBalanceChecks) return [3, 3];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 3:
+                        case 2:
                             unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _c.label = 4;
-                        case 4:
+                            _c.label = 3;
+                        case 3:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -6109,22 +5966,22 @@ var PerpetualsClient = (function () {
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
                             additionalSigners.push(wrappedSolAccount);
-                            return [3, 8];
-                        case 5: return [4, (0, utils_1.checkIfAccountExists)(userReserveTokenAccount, this.provider.connection)];
-                        case 6:
+                            return [3, 7];
+                        case 4: return [4, (0, utils_1.checkIfAccountExists)(userReserveTokenAccount, this.provider.connection)];
+                        case 5:
                             if (!(_c.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            if (!!skipBalanceChecks) return [3, 8];
+                            if (!!skipBalanceChecks) return [3, 7];
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userReserveTokenAccount)];
-                        case 7:
+                        case 6:
                             tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_c.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(reserveAmount)) {
                                 throw "Insufficient Funds need more ".concat(reserveAmount.sub(tokenAccountBalance), " tokens");
                             }
-                            _c.label = 8;
-                        case 8:
+                            _c.label = 7;
+                        case 7:
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             orderAccount = poolConfig.getOrderFromMarketPk(publicKey, marketAccount);
                             return [4, this.program.methods
@@ -6151,21 +6008,22 @@ var PerpetualsClient = (function () {
                                     reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
                                     receiveCustody: receiveCustodyConfig.custodyAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    fundingMint: reserveCustodyConfig.mintKey,
                                 })
                                     .instruction()];
-                        case 9:
+                        case 8:
                             placeLimitOrder = _c.sent();
                             instructions.push(placeLimitOrder);
-                            return [3, 11];
-                        case 10:
-                            err_39 = _c.sent();
-                            console.log("perpClient placeLimitOrder error:: ", err_39);
-                            throw err_39;
-                        case 11: return [2, {
+                            return [3, 10];
+                        case 9:
+                            err_38 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_38);
+                            throw err_38;
+                        case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -6173,15 +6031,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_40;
-                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_39;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6219,7 +6073,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 5];
                         case 2:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, publicKey, true);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             _a = createUserATA;
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -6228,7 +6082,7 @@ var PerpetualsClient = (function () {
                             _b.label = 4;
                         case 4:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(reserveSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             _b.label = 5;
                         case 5:
@@ -6269,9 +6123,9 @@ var PerpetualsClient = (function () {
                             instructions.push(editLimitOrder);
                             return [3, 8];
                         case 7:
-                            err_40 = _b.sent();
-                            console.log("perpClient editLimitOrder error:: ", err_40);
-                            throw err_40;
+                            err_39 = _b.sent();
+                            console.log("perpClient editLimitOrder error:: ", err_39);
+                            throw err_39;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6280,16 +6134,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_41;
-                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_40;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -6338,9 +6188,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitOrder);
                             return [3, 4];
                         case 3:
-                            err_41 = _a.sent();
-                            console.log("perpClient executeLimitOrder error:: ", err_41);
-                            throw err_41;
+                            err_40 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_40);
+                            throw err_40;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6349,16 +6199,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_42;
-                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_41;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -6410,9 +6256,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitWithSwap);
                             return [3, 4];
                         case 3:
-                            err_42 = _a.sent();
-                            console.log("perpClient executeLimitWithSwap error:: ", err_42);
-                            throw err_42;
+                            err_41 = _a.sent();
+                            console.log("perpClient executeLimitWithSwap error:: ", err_41);
+                            throw err_41;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6422,7 +6268,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_43;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_42;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6470,9 +6316,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_43 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_43);
-                        throw err_43;
+                        err_42 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_42);
+                        throw err_42;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6481,7 +6327,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_44;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_43;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6528,9 +6374,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_44 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_44);
-                        throw err_44;
+                        err_43 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_43);
+                        throw err_43;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6539,7 +6385,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_45;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_44;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6572,9 +6418,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_45 = _a.sent();
-                        console.log("perpClient cancelTriggerOrder error:: ", err_45);
-                        throw err_45;
+                        err_44 = _a.sent();
+                        console.log("perpClient cancelTriggerOrder error:: ", err_44);
+                        throw err_44;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6583,7 +6429,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_46;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_45;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6614,9 +6460,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelAllTriggerOrders);
                         return [3, 4];
                     case 3:
-                        err_46 = _a.sent();
-                        console.log("perpClient cancelAllTriggerOrders error:: ", err_46);
-                        throw err_46;
+                        err_45 = _a.sent();
+                        console.log("perpClient cancelAllTriggerOrders error:: ", err_45);
+                        throw err_45;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6624,20 +6470,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_47;
-                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, collateralToken, receivingToken, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, executeTriggerWithSwap, err_46;
+                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); });
@@ -6648,19 +6490,21 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _e.label = 1;
+                            collateralToken = poolConfig.getTokenFromSymbol(collateralSymbol);
+                            receivingToken = poolConfig.getTokenFromSymbol(receivingSymbol);
+                            _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:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(receivingSymbol).mintKey, owner, true);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(receivingSymbol).mintKey, owner, true, receivingToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             _a = createUserATA;
                             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));
@@ -6670,20 +6514,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,
@@ -6720,21 +6564,24 @@ var PerpetualsClient = (function () {
                                     dispensingCustody: receivingCustodyConfig.custodyAccount,
                                     dispensingOracleAccount: this.useExtOracleAccount ? receivingCustodyConfig.extOracleAccount : receivingCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: receivingCustodyConfig.tokenAccount,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    receivingMint: receivingCustodyConfig.mintKey,
+                                    receivingTokenProgram: receivingToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    collateralMint: collateralCustodyConfig.mintKey,
+                                    collateralTokenProgram: collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                                 })
                                     .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_47 = _e.sent();
-                            console.log("perpClient executeTriggerWithSwap error:: ", err_47);
-                            throw err_47;
+                            err_46 = _d.sent();
+                            console.log("perpClient executeTriggerWithSwap error:: ", err_46);
+                            throw err_46;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6743,18 +6590,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_48;
-                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_47;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6772,7 +6615,7 @@ var PerpetualsClient = (function () {
                             if (!false) return [3, 2];
                             return [3, 5];
                         case 2:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, owner, true);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, owner, true, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             _a = createUserATA;
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -6781,7 +6624,7 @@ var PerpetualsClient = (function () {
                             _b.label = 4;
                         case 4:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
                             _b.label = 5;
                         case 5:
@@ -6808,10 +6651,11 @@ var PerpetualsClient = (function () {
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    receivingMint: collateralCustodyConfig.mintKey
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, rebateTokenAccount, privilege), true))
                                     .instruction()];
@@ -6820,9 +6664,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerOrder);
                             return [3, 8];
                         case 7:
-                            err_48 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_48);
-                            throw err_48;
+                            err_47 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_47);
+                            throw err_47;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6832,7 +6676,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_49;
+            var payerPubkey, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_48;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6862,9 +6706,9 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_49 = _a.sent();
-                        console.log("perpClient migrateTriggerOrder error:: ", err_49);
-                        throw err_49;
+                        err_48 = _a.sent();
+                        console.log("perpClient migrateTriggerOrder error:: ", err_48);
+                        throw err_48;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6872,20 +6716,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_50;
-                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_49;
+                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) {
@@ -6903,10 +6743,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));
                             }
@@ -6914,11 +6754,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,
@@ -6940,20 +6780,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";
                             }
@@ -6980,18 +6820,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);
@@ -7016,23 +6856,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,
@@ -7065,14 +6905,17 @@ var PerpetualsClient = (function () {
                                     dispensingCustodyOracleAccount: this.useExtOracleAccount ? userOutputCustodyConfig.extOracleAccount : userOutputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    fundingMint: userInputCustodyConfig.mintKey,
+                                    fundingTokenProgram: poolConfig.getTokenFromSymbol(userInputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    receivingMint: userOutputCustodyConfig.mintKey,
+                                    receivingTokenProgram: poolConfig.getTokenFromSymbol(userOutputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .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);
@@ -7080,9 +6923,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 20];
                         case 19:
-                            err_50 = _g.sent();
-                            console.error("perpClient Swap error:: ", err_50);
-                            throw err_50;
+                            err_49 = _f.sent();
+                            console.error("perpClient Swap error:: ", err_49);
+                            throw err_49;
                         case 20: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -7092,7 +6935,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.swapFeeInternal = function (rewardTokenSymbol, swapTokenSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_51;
+            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_50;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -7152,9 +6995,9 @@ var PerpetualsClient = (function () {
                         instructions.push(inx);
                         return [3, 4];
                     case 3:
-                        err_51 = _b.sent();
-                        console.error("perpClient Swap error:: ", err_51);
-                        throw err_51;
+                        err_50 = _b.sent();
+                        console.error("perpClient Swap error:: ", err_50);
+                        throw err_50;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7202,7 +7045,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setAdminSigners = function (admins, minSignatures) { return __awaiter(_this, void 0, void 0, function () {
-            var adminMetas, _i, admins_2, admin, err_52;
+            var adminMetas, _i, admins_2, admin, err_51;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7232,11 +7075,11 @@ var PerpetualsClient = (function () {
                         _a.sent();
                         return [3, 4];
                     case 3:
-                        err_52 = _a.sent();
+                        err_51 = _a.sent();
                         if (this.printErrors) {
-                            console.error("setAdminSigners err:", err_52);
+                            console.error("setAdminSigners err:", err_51);
                         }
-                        throw err_52;
+                        throw err_51;
                     case 4: return [2];
                 }
             });
@@ -7301,7 +7144,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCustody = function (poolName, tokenMint, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment) { return __awaiter(_this, void 0, void 0, function () {
+        this.addCustody = function (poolName, tokenMint, isToken222, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment) { return __awaiter(_this, void 0, void 0, function () {
             var trx_id, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -7310,14 +7153,15 @@ var PerpetualsClient = (function () {
                         return [4, this.program.methods
                                 .addCustody({
                                 isStable: isStable,
+                                depegAdjustment: depegAdjustment,
                                 isVirtual: isVirtual,
+                                token22: isToken222,
                                 oracle: oracle,
                                 pricing: pricing,
                                 permissions: permissions,
                                 fees: fees,
                                 borrowRate: borrowRate,
                                 ratios: ratios,
-                                depegAdjustment: depegAdjustment
                             })
                                 .accounts({
                                 admin: this.admin,
@@ -7423,7 +7267,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.protocolWithdrawFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_53;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_52;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7455,9 +7299,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_53 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_53);
-                        throw err_53;
+                        err_52 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_52);
+                        throw err_52;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7466,7 +7310,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.moveProtocolFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_54;
+            var publicKey, custodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_53;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7499,9 +7343,9 @@ var PerpetualsClient = (function () {
                         instructions.push(moveProtocolFeesIx);
                         return [3, 4];
                     case 3:
-                        err_54 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_54);
-                        throw err_54;
+                        err_53 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_53);
+                        throw err_53;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7510,7 +7354,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setProtocolFeeShareBps = function (feeShareBps, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, setProtocolFeeShareBpsIx, err_55;
+            var publicKey, setProtocolFeeShareBpsIx, err_54;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7530,15 +7374,15 @@ var PerpetualsClient = (function () {
                         setProtocolFeeShareBpsIx = _a.sent();
                         return [2, setProtocolFeeShareBpsIx];
                     case 2:
-                        err_55 = _a.sent();
-                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_55);
-                        throw err_55;
+                        err_54 = _a.sent();
+                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_54);
+                        throw err_54;
                     case 3: return [2];
                 }
             });
         }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_56;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_55;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7565,9 +7409,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_56 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_56);
-                        throw err_56;
+                        err_55 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_55);
+                        throw err_55;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7576,7 +7420,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_57;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_56;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -7636,9 +7480,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_57 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_57);
-                        throw err_57;
+                        err_56 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_56);
+                        throw err_56;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7647,7 +7491,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_58;
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_57;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7680,9 +7524,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_58 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_58);
-                        throw err_58;
+                        err_57 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_57);
+                        throw err_57;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7691,7 +7535,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalOraclePriceBatch = function (tokenMintList, tokenInternalPrices, POOL_CONFIGS) { return __awaiter(_this, void 0, void 0, function () {
-            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_1, _i, tokenMintList_1, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_59;
+            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_1, _i, tokenMintList_1, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_58;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7741,9 +7585,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_59 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_59);
-                        throw err_59;
+                        err_58 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_58);
+                        throw err_58;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7752,7 +7596,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalOracleEmaPriceBatch = function (tokenMintList, tokenInternalEmaPrices, POOL_CONFIGS) { return __awaiter(_this, void 0, void 0, function () {
-            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_2, _i, tokenMintList_2, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_60;
+            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_2, _i, tokenMintList_2, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_59;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7802,9 +7646,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_60 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_60);
-                        throw err_60;
+                        err_59 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_59);
+                        throw err_59;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7813,7 +7657,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_61;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_60;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7851,8 +7695,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_61 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_61);
+                        err_60 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_60);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -7862,7 +7706,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initStake = function (stakingFeeShareBps, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_62;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_61;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7900,9 +7744,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_62 = _a.sent();
-                        console.log("perpClient InitStaking error:: ", err_62);
-                        throw err_62;
+                        err_61 = _a.sent();
+                        console.log("perpClient InitStaking error:: ", err_61);
+                        throw err_61;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7911,7 +7755,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initCompounding = function (feeShareBps, metadataTitle, metadataSymbol, metadataUri, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_63;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_62;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7956,9 +7800,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initCompoundingInstruction);
                         return [3, 4];
                     case 3:
-                        err_63 = _a.sent();
-                        console.log("perpClient initCompounding error:: ", err_63);
-                        throw err_63;
+                        err_62 = _a.sent();
+                        console.log("perpClient initCompounding error:: ", err_62);
+                        throw err_62;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7967,7 +7811,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initTokenVault = function (token_permissions, tokens_to_distribute, withdrawTimeLimit, withdrawInstantFee, stakeLevel, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_64;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_63;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8008,9 +7852,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initTokenVaultInstruction);
                         return [3, 4];
                     case 3:
-                        err_64 = _a.sent();
-                        console.log("perpClient InitTokenVaultInstruction error:: ", err_64);
-                        throw err_64;
+                        err_63 = _a.sent();
+                        console.log("perpClient InitTokenVaultInstruction error:: ", err_63);
+                        throw err_63;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8019,7 +7863,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenVaultConfig = function (token_permissions, withdrawTimeLimit, withdrawInstantFee, stakeLevel, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_65;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_64;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8050,9 +7894,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenVaultConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_65 = _a.sent();
-                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_65);
-                        throw err_65;
+                        err_64 = _a.sent();
+                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_64);
+                        throw err_64;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8061,7 +7905,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawInstantFee = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_66;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_65;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8099,9 +7943,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawInstantFeeInstruction);
                         return [3, 6];
                     case 5:
-                        err_66 = _a.sent();
-                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_66);
-                        throw err_66;
+                        err_65 = _a.sent();
+                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_65);
+                        throw err_65;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8110,7 +7954,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRevenueTokenAccount = function (feeShareBps, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_67;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_66;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8147,9 +7991,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRevenueTokenAccountInstruction);
                         return [3, 4];
                     case 3:
-                        err_67 = _a.sent();
-                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_67);
-                        throw err_67;
+                        err_66 = _a.sent();
+                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_66);
+                        throw err_66;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8158,7 +8002,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.distributeTokenReward = function (amount, epochCount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_68;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_67;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8196,9 +8040,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_68 = _a.sent();
-                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_68);
-                        throw err_68;
+                        err_67 = _a.sent();
+                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_67);
+                        throw err_67;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8207,7 +8051,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_69;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_68;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8235,9 +8079,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenStakeLevelInstruction);
                         return [3, 4];
                     case 3:
-                        err_69 = _a.sent();
-                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_69);
-                        throw err_69;
+                        err_68 = _a.sent();
+                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_68);
+                        throw err_68;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8246,7 +8090,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_70;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_69;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8278,9 +8122,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_70 = _a.sent();
-                        console.log("perpClient setTokenRewardInstruction error:: ", err_70);
-                        throw err_70;
+                        err_69 = _a.sent();
+                        console.log("perpClient setTokenRewardInstruction error:: ", err_69);
+                        throw err_69;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8389,9 +8233,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))];
@@ -8400,9 +8244,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))];