flash-sdk 2.25.8 → 2.26.1

package/dist/PerpetualsClient.js

@@ -501,7 +501,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCustody = function (poolName, tokenMint, isStable, isVirtual, token22, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment) { return __awaiter(_this, void 0, void 0, function () {
+        this.addCustody = function (poolName, tokenMint, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment) { return __awaiter(_this, void 0, void 0, function () {
             var trx_id, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -511,7 +511,6 @@ var PerpetualsClient = (function () {
                                 .addCustody({
                                 isStable: isStable,
                                 isVirtual: isVirtual,
-                                token22: token22,
                                 oracle: oracle,
                                 pricing: pricing,
                                 permissions: permissions,
@@ -2482,33 +2481,34 @@ var PerpetualsClient = (function () {
             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, rebateMintAccount, params, instruction;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, 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);
-                            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);
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true)];
+                        case 1:
+                            userCollateralTokenAccount = _c.sent();
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            if (!(collateralSymbol == 'SOL')) return [3, 3];
+                            if (!(collateralSymbol == 'SOL')) return [3, 4];
                             console.log("collateralSymbol === SOL", collateralSymbol);
                             lamports = collateralWithfee.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
-                            if (!!skipBalanceChecks) return [3, 2];
+                            if (!!skipBalanceChecks) return [3, 3];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 1:
+                        case 2:
                             unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _c.label = 2;
-                        case 2:
+                            _c.label = 3;
+                        case 3:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -2526,29 +2526,24 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 6];
-                        case 3:
-                            if (!!skipBalanceChecks) return [3, 6];
-                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                            return [3, 7];
                         case 4:
+                            if (!!skipBalanceChecks) return [3, 7];
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 5:
                             if (!(_c.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userCollateralTokenAccount)];
-                        case 5:
+                        case 6:
                             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 = 6;
-                        case 6:
+                            _c.label = 7;
+                        case 7:
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
-                            rebateMintAccount = {
-                                pubkey: collateralCustodyConfig.mintKey,
-                                isSigner: false,
-                                isWritable: false
-                            };
                             params = {
                                 priceWithSlippage: priceWithSlippage,
                                 collateralAmount: collateralWithfee,
@@ -2571,16 +2566,15 @@ var PerpetualsClient = (function () {
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
-                                    tokenProgram: collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
                                     transferAuthority: this.authority.publicKey,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    fundingMint: collateralCustodyConfig.mintKey
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), [rebateMintAccount], false))
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
                                     .instruction()];
-                        case 7:
+                        case 8:
                             instruction = _c.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -2646,7 +2640,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 6];
                         case 3:
-                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(swapPoolConfig.getTokenFromSymbol(inputSymbol).mintKey, publicKey, true, swapPoolConfig.getTokenFromSymbol(inputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(swapPoolConfig.getTokenFromSymbol(inputSymbol).mintKey, publicKey, true);
                             if (!!skipBalanceChecks) return [3, 6];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 4:
@@ -2662,11 +2656,11 @@ var PerpetualsClient = (function () {
                             }
                             _d.label = 6;
                         case 6:
-                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(swapPoolConfig.getTokenFromSymbol(swapOutCustodyConfig.symbol).mintKey, publicKey, true, swapPoolConfig.getTokenFromSymbol(swapOutCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(swapPoolConfig.getTokenFromSymbol(swapOutCustodyConfig.symbol).mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
                         case 7:
                             if (!(_d.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, swapPoolConfig.getTokenFromSymbol(swapOutCustodyConfig.symbol).mintKey, swapPoolConfig.getTokenFromSymbol(swapOutCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, swapPoolConfig.getTokenFromSymbol(swapOutCustodyConfig.symbol).mintKey));
                             }
                             marketAccount = positionPoolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             positionAccount = positionPoolConfig.getPositionFromMarketPk(publicKey, marketAccount);
@@ -2741,7 +2735,7 @@ var PerpetualsClient = (function () {
             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, rebateMintAccount, instruction, closeWsolATAIns, error_2;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, instruction, closeWsolATAIns, error_2;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -2775,7 +2769,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 5];
                         case 2:
-                            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);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
                             _a = createUserATA;
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -2784,7 +2778,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, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
                             _b.label = 5;
                         case 5:
@@ -2792,11 +2786,6 @@ var PerpetualsClient = (function () {
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
-                            rebateMintAccount = {
-                                pubkey: collateralCustodyConfig.mintKey,
-                                isSigner: false,
-                                isWritable: false
-                            };
                             return [4, this.program.methods
                                     .closePosition({
                                     priceWithSlippage: priceWithSlippage,
@@ -2817,12 +2806,11 @@ var PerpetualsClient = (function () {
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    receivingMint: collateralCustodyConfig.mintKey
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), [rebateMintAccount], false))
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
                                     .instruction()];
                         case 6:
                             instruction = _b.sent();
@@ -2887,21 +2875,22 @@ var PerpetualsClient = (function () {
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
                             additionalSigners.push(wrappedSolAccount);
-                            return [3, 3];
-                        case 1:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true, swapPoolConfig.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)];
+                            return [3, 4];
+                        case 1: return [4, (0, spl_token_1.getAssociatedTokenAddress)(swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true)];
                         case 2:
+                            userReceivingTokenAccount = _b.sent();
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
                             if (!(_b.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey, swapPoolConfig.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey));
                             }
-                            _b.label = 3;
-                        case 3:
-                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true, positionPoolConfig.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)];
+                            _b.label = 4;
                         case 4:
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 5:
                             if (!(_b.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey, positionPoolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
                             marketAccount = positionPoolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             positionAccount = positionPoolConfig.getPositionFromMarketPk(publicKey, marketAccount);
@@ -2950,11 +2939,11 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
-                        case 5:
+                        case 6:
                             instruction = _b.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -2972,7 +2961,7 @@ var PerpetualsClient = (function () {
             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, tokenAccountBalance, _b, userOutputTokenAccount, rebateMintAccount, inx, err_2;
+                var publicKey, userInputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userOutputTokenAccount, inx, err_2;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -2998,8 +2987,6 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            targetToken = poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol);
-                            userInputToken = poolConfig.getTokenFromSymbol(userInputTokenSymbol);
                             if (!(userInputTokenSymbol == 'SOL')) return [3, 3];
                             console.log("inputSymbol === SOL", userInputTokenSymbol);
                             lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
@@ -3032,7 +3019,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 6];
                         case 3:
-                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(userInputToken.mintKey, publicKey, true, userInputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey, publicKey, true);
                             if (!!skipBalanceChecks) return [3, 6];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 4:
@@ -3048,17 +3035,12 @@ var PerpetualsClient = (function () {
                             }
                             _c.label = 6;
                         case 6:
-                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(targetToken.mintKey, publicKey, true, targetToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
                         case 7:
                             if (!(_c.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, targetToken.mintKey, targetToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey));
                             }
-                            rebateMintAccount = {
-                                pubkey: collateralCustodyConfig.mintKey,
-                                isSigner: false,
-                                isWritable: false
-                            };
                             _c.label = 8;
                         case 8:
                             _c.trys.push([8, 10, , 11]);
@@ -3088,14 +3070,12 @@ var PerpetualsClient = (function () {
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
-                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    fundingMint: userInputCustodyConfig.mintKey,
-                                    fundingTokenProgram: userInputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), [rebateMintAccount], false))
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
                                     .instruction()];
                         case 9:
                             inx = _c.sent();
@@ -3119,7 +3099,7 @@ var PerpetualsClient = (function () {
             if (nftRebateTokenAccount === void 0) { nftRebateTokenAccount = 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_3;
+                var publicKey, userOutputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, inx, err_3;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -3145,8 +3125,6 @@ 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);
@@ -3168,30 +3146,26 @@ var PerpetualsClient = (function () {
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
                             additionalSigners.push(wrappedSolAccount);
-                            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)];
+                            return [3, 4];
+                        case 1: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true)];
                         case 2:
+                            userReceivingTokenAccount = _a.sent();
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
                             if (!(_a.sent())) {
-                                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));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey));
                             }
-                            _a.label = 3;
-                        case 3:
-                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralToken.mintKey, publicKey, true, collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                            _a.label = 4;
                         case 4:
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralTokenSymbol).mintKey, publicKey, true);
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 5:
                             if (!(_a.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralToken.mintKey, collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralTokenSymbol).mintKey));
                             }
-                            rebateMintAccount = {
-                                pubkey: collateralCustodyConfig.mintKey,
-                                isSigner: false,
-                                isWritable: false
-                            };
-                            _a.label = 5;
-                        case 5:
-                            _a.trys.push([5, 7, , 8]);
+                            _a.label = 6;
+                        case 6:
+                            _a.trys.push([6, 8, , 9]);
                             return [4, this.program.methods
                                     .closeAndSwap({
                                     priceWithSlippage: priceWithSlippage,
@@ -3216,25 +3190,22 @@ 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,
-                                    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
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), [rebateMintAccount], false))
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
                                     .instruction()];
-                        case 6:
+                        case 7:
                             inx = _a.sent();
                             instructions.push(inx);
-                            return [3, 8];
-                        case 7:
+                            return [3, 9];
+                        case 8:
                             err_3 = _a.sent();
                             console.error("perpClient CloseAndSwap error:: ", err_3);
                             throw err_3;
-                        case 8: return [2, {
+                        case 9: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -3249,7 +3220,7 @@ var PerpetualsClient = (function () {
             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, userOutputToken, userInputToken, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _i, _e, custody, params, inx, closeWsolATAIns, err_4;
+                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _i, _e, custody, params, inx, closeWsolATAIns, err_4;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -3266,26 +3237,26 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            userOutputToken = poolConfig.getTokenFromSymbol(userOutputTokenSymbol);
-                            userInputToken = poolConfig.getTokenFromSymbol(userInputTokenSymbol);
-                            if (!(userInputTokenSymbol == 'SOL' && userOutputTokenSymbol == 'WSOL')) return [3, 4];
-                            wsolAssociatedTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, publicKey, true);
-                            return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
+                            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 = _f.sent();
+                            return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
+                        case 2:
                             wsolATAExist = _f.sent();
                             if (!wsolATAExist) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
                             }
-                            if (!!skipBalanceChecks) return [3, 3];
+                            if (!!skipBalanceChecks) return [3, 4];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 2:
+                        case 3:
                             unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _f.sent()]))();
                             if (unWrappedSolBalance.lt(amountIn)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _f.label = 3;
-                        case 3:
+                            _f.label = 4;
+                        case 4:
                             instructions.push(web3_js_1.SystemProgram.transfer({
                                 fromPubkey: publicKey,
                                 toPubkey: wsolAssociatedTokenAccount,
@@ -3295,7 +3266,7 @@ var PerpetualsClient = (function () {
                                     instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                     additionalSigners: additionalSigners
                                 }];
-                        case 4:
+                        case 5:
                             if (userInputTokenSymbol == 'WSOL' && userOutputTokenSymbol == 'SOL') {
                                 console.log("WSOL=> SOL : NOTE : ONLY WAY IS TO CLOSE THE WSOL ATA and GET ALL SOL ");
                                 wsolAssociatedTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, publicKey, true);
@@ -3306,19 +3277,19 @@ var PerpetualsClient = (function () {
                                         additionalSigners: additionalSigners
                                     }];
                             }
-                            _f.label = 5;
-                        case 5:
-                            _f.trys.push([5, 17, , 18]);
-                            if (!(userInputTokenSymbol == 'SOL')) return [3, 8];
+                            _f.label = 6;
+                        case 6:
+                            _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 6:
+                        case 7:
                             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 7:
+                        case 8:
                             unWrappedSolBalance = new (_b.apply(anchor_1.BN, [void 0, _f.sent()]))();
                             if (unWrappedSolBalance.lt(amountIn)) {
                                 throw "Insufficient SOL Funds";
@@ -3341,25 +3312,25 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 11];
-                        case 8:
-                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(userInputToken.mintKey, publicKey, true, userInputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                            return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
+                            return [3, 12];
                         case 9:
+                            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 (!(_f.sent())) {
                                 throw "Insufficient Funds , Token Account doesn't exist";
                             }
-                            if (!!skipBalanceChecks) return [3, 11];
+                            if (!!skipBalanceChecks) return [3, 12];
                             _c = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
-                        case 10:
+                        case 11:
                             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");
                             }
-                            _f.label = 11;
-                        case 11:
-                            if (!(userOutputTokenSymbol == 'SOL')) return [3, 12];
+                            _f.label = 12;
+                        case 12:
+                            if (!(userOutputTokenSymbol == 'SOL')) return [3, 13];
                             lamports = (this.minimumBalanceForRentExemptAccountLamports);
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
@@ -3379,21 +3350,22 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 15];
-                        case 12:
-                            userOutputTokenAccount = (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 [3, 17];
+                        case 13: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true)];
+                        case 14:
+                            userOutputTokenAccount = _f.sent();
                             _d = createUserATA;
-                            if (!_d) return [3, 14];
+                            if (!_d) return [3, 16];
                             return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
-                        case 13:
+                        case 15:
                             _d = !(_f.sent());
-                            _f.label = 14;
-                        case 14:
+                            _f.label = 16;
+                        case 16:
                             if (_d) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, userOutputToken.mintKey, userOutputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey));
                             }
-                            _f.label = 15;
-                        case 15:
+                            _f.label = 17;
+                        case 17:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             for (_i = 0, _e = poolConfig.custodies; _i < _e.length; _i++) {
@@ -3430,28 +3402,25 @@ 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,
-                                    fundingMint: userInputCustodyConfig.mintKey,
-                                    fundingTokenProgram: userInputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                    receivingMint: userOutputCustodyConfig.mintKey,
-                                    receivingTokenProgram: userOutputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
-                        case 16:
+                        case 18:
                             inx = _f.sent();
                             instructions.push(inx);
                             if (userOutputTokenSymbol == 'SOL' && unWrapSol) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userOutputTokenAccount, publicKey, publicKey);
                                 instructions.push(closeWsolATAIns);
                             }
-                            return [3, 18];
-                        case 17:
+                            return [3, 20];
+                        case 19:
                             err_4 = _f.sent();
                             console.error("perpClient Swap error:: ", err_4);
                             throw err_4;
-                        case 18: return [2, {
+                        case 20: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -3545,7 +3514,7 @@ var PerpetualsClient = (function () {
                             if (!collateralCustodyConfig || !targetCustodyConfig) {
                                 throw "payTokenCustody not found";
                             }
-                            userPayingTokenAccount = (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);
+                            userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true);
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
@@ -3612,10 +3581,9 @@ var PerpetualsClient = (function () {
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
-                                tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                fundingMint: collateralCustodyConfig.mintKey
                             })
                                 .instruction()];
                         case 7:
@@ -3685,7 +3653,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 6];
                         case 3:
-                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true, poolConfigSwap.getTokenFromSymbol(inputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true);
                             if (!!skipBalanceChecks) return [3, 6];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 4:
@@ -3701,11 +3669,11 @@ var PerpetualsClient = (function () {
                             }
                             _d.label = 6;
                         case 6:
-                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true, poolConfigPosition.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
                         case 7:
                             if (!(_d.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralCustodyConfig.mintKey, poolConfigPosition.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralCustodyConfig.mintKey));
                             }
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
@@ -3814,7 +3782,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 5];
                         case 2:
-                            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);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
                             _a = createUserATA;
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -3823,7 +3791,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, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
                             _b.label = 5;
                         case 5:
@@ -3846,10 +3814,9 @@ var PerpetualsClient = (function () {
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    receivingMint: collateralCustodyConfig.mintKey
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .instruction()];
                         case 6:
@@ -3913,19 +3880,19 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 3];
                         case 1:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfigSwap.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true, poolConfigSwap.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfigSwap.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                         case 2:
                             if (!(_b.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfigSwap.getTokenFromSymbol(outputSymbol).mintKey, poolConfigSwap.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfigSwap.getTokenFromSymbol(outputSymbol).mintKey));
                             }
                             _b.label = 3;
                         case 3:
-                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfigPosition.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true, poolConfigPosition.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfigPosition.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
                         case 4:
                             if (!(_b.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfigPosition.getTokenFromSymbol(collateralSymbol).mintKey, poolConfigPosition.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfigPosition.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
                             marketAccount = poolConfigPosition.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             positionAccount = poolConfigPosition.getPositionFromMarketPk(publicKey, marketAccount);
@@ -3993,7 +3960,7 @@ var PerpetualsClient = (function () {
             if (nftReferralAccount === void 0) { nftReferralAccount = web3_js_1.PublicKey.default; }
             if (nftRebateTokenAccount === void 0) { nftRebateTokenAccount = web3_js_1.PublicKey.default; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, rebateMintAccount, instruction;
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, instruction;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -4012,11 +3979,6 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            rebateMintAccount = {
-                                pubkey: collateralCustodyConfig.mintKey,
-                                isSigner: false,
-                                isWritable: false
-                            };
                             return [4, this.program.methods
                                     .increaseSize({
                                     priceWithSlippage: priceWithSlippage,
@@ -4035,12 +3997,12 @@ var PerpetualsClient = (function () {
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), [rebateMintAccount], false))
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
                                     .instruction()];
                         case 1:
                             instruction = _a.sent();
@@ -4058,7 +4020,7 @@ var PerpetualsClient = (function () {
             if (nftReferralAccount === void 0) { nftReferralAccount = web3_js_1.PublicKey.default; }
             if (nftRebateTokenAccount === void 0) { nftRebateTokenAccount = web3_js_1.PublicKey.default; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, rebateMintAccount, instruction;
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, instruction;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -4077,11 +4039,6 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            rebateMintAccount = {
-                                pubkey: collateralCustodyConfig.mintKey,
-                                isSigner: false,
-                                isWritable: false
-                            };
                             return [4, this.program.methods
                                     .decreaseSize({
                                     priceWithSlippage: priceWithSlippage,
@@ -4100,12 +4057,12 @@ var PerpetualsClient = (function () {
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), [rebateMintAccount], false))
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
                                     .instruction()];
                         case 1:
                             instruction = _a.sent();
@@ -4122,7 +4079,7 @@ var PerpetualsClient = (function () {
             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_6;
+                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, tokenAccountBalance, _e, instruction, err_6;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -4135,11 +4092,10 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            payToken = poolConfig.getTokenFromSymbol(payTokenSymbol);
                             _f.label = 1;
                         case 1:
                             _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);
+                            userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(payTokenCustodyConfig.mintKey, publicKey, true);
                             lpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.stakedLpTokenMint, publicKey, true);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
@@ -4235,9 +4191,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,
-                                fundingMint: payTokenCustodyConfig.mintKey,
-                                fundingTokenProgram: payToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                 .instruction()];
@@ -4261,7 +4215,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, inputToken, lpTokenAccount, flpStakeAccount, poolStakedLpVault, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _c, custody, _d, _e, market, instruction;
+                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, flpStakeAccount, poolStakedLpVault, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _c, custody, _d, _e, market, instruction;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -4272,7 +4226,6 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             lpTokenMint = poolConfig.stakedLpTokenMint;
                             inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
-                            inputToken = poolConfig.getTokenFromSymbol(inputSymbol);
                             lpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(lpTokenMint, publicKey, true);
                             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];
@@ -4313,7 +4266,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 7];
                         case 4:
-                            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);
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true);
                             if (!!skipBalanceChecks) return [3, 7];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 5:
@@ -4373,9 +4326,7 @@ var PerpetualsClient = (function () {
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    fundingMint: inputCustodyConfig.mintKey,
-                                    fundingTokenProgram: inputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
@@ -4396,7 +4347,7 @@ var PerpetualsClient = (function () {
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = 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_7;
+                var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, _d, removeLiquidityTx, closeInx, closeWsolATAIns, err_7;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -4409,7 +4360,6 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            recieveToken = poolConfig.getTokenFromSymbol(recieveTokenSymbol);
                             _e.label = 1;
                         case 1:
                             _e.trys.push([1, 7, , 8]);
@@ -4459,7 +4409,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 5];
                         case 2:
-                            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);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey, publicKey, true);
                             _d = createUserATA;
                             if (!_d) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -4468,7 +4418,7 @@ var PerpetualsClient = (function () {
                             _e.label = 4;
                         case 4:
                             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));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey));
                             }
                             _e.label = 5;
                         case 5: return [4, this.program.methods
@@ -4490,9 +4440,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,
-                                receivingMint: recieveTokenCustodyConfig.mintKey,
-                                receivingTokenProgram: recieveToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                 .instruction()];
@@ -4619,7 +4567,7 @@ var PerpetualsClient = (function () {
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _a.trys.push([1, 4, , 5]);
                         nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
                             Buffer.from("trading"),
                             nftMint.toBuffer(),
@@ -4628,7 +4576,9 @@ var PerpetualsClient = (function () {
                             Buffer.from("referral"),
                             publicKey.toBuffer(),
                         ], this.programId)[0];
-                        nftTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(nftMint, publicKey, true);
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(nftMint, publicKey, true)];
+                    case 2:
+                        nftTokenAccount = _a.sent();
                         flpStakeAccountMetas = [];
                         for (_i = 0, flpStakeAccounts_1 = flpStakeAccounts; _i < flpStakeAccounts_1.length; _i++) {
                             flpStakeAccountPk = flpStakeAccounts_1[_i];
@@ -4651,15 +4601,15 @@ var PerpetualsClient = (function () {
                                 tradingAccount: nftTradingAccount
                             })
                                 .instruction()];
-                    case 2:
+                    case 3:
                         updateNftTradingAccountInstruction = _a.sent();
                         instructions.push(updateNftTradingAccountInstruction);
-                        return [3, 4];
-                    case 3:
+                        return [3, 5];
+                    case 4:
                         err_10 = _a.sent();
                         console.log("perpClient updateNftAccount error:: ", err_10);
                         throw err_10;
-                    case 4: return [2, {
+                    case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -4832,11 +4782,13 @@ var PerpetualsClient = (function () {
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _a.trys.push([1, 4, , 5]);
                         lpTokenMint = poolConfig.stakedLpTokenMint;
                         poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
                         flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), owner.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
-                        userLpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.stakedLpTokenMint, owner, true);
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.stakedLpTokenMint, owner, true)];
+                    case 2:
+                        userLpTokenAccount = _a.sent();
                         return [4, this.program.methods
                                 .depositStake({
                                 depositAmount: depositAmount
@@ -4853,19 +4805,18 @@ var PerpetualsClient = (function () {
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
-                                program: this.programId,
-                                lpTokenMint: poolConfig.stakedLpTokenMint
+                                program: this.programId
                             })
                                 .instruction()];
-                    case 2:
+                    case 3:
                         depositStakeInstruction = _a.sent();
                         instructions.push(depositStakeInstruction);
-                        return [3, 4];
-                    case 3:
+                        return [3, 5];
+                    case 4:
                         err_14 = _a.sent();
                         console.log("perpClient depositStaking error:: ", err_14);
                         throw err_14;
-                    case 4: return [2, {
+                    case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -5152,7 +5103,6 @@ var PerpetualsClient = (function () {
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
-                                    lpMint: poolConfig.stakedLpTokenMint
                                 })
                                     .instruction()];
                         case 4:
@@ -5190,7 +5140,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, poolConfig.getTokenFromSymbol(rewardSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                             _a = createUserATA;
                             if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
@@ -5199,7 +5149,7 @@ var PerpetualsClient = (function () {
                             _b.label = 3;
                         case 3:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint, poolConfig.getTokenFromSymbol(rewardSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint));
                             }
                             tradingAccount = [];
                             if (nftTradingAccount) {
@@ -5232,8 +5182,7 @@ var PerpetualsClient = (function () {
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    receivingMint: rewardCustodyMint
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray([], tradingAccount, true), boostingAccount, true))
                                     .instruction()];
@@ -5302,19 +5251,18 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.distributeReward = function (rewardAmount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardToken, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_22;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_22;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
-                        rewardToken = poolConfig.getTokenFromSymbol(rewardSymbol);
-                        rewardCustodyMint = rewardToken.mintKey;
+                        rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
                         instructions = [];
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        fundingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                        fundingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                         rewardVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_vault")], this.programFbnftReward.programId)[0];
                         rewardTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_token_account")], this.programFbnftReward.programId)[0];
                         return [4, this.programFbnftReward.methods
@@ -5347,13 +5295,12 @@ var PerpetualsClient = (function () {
         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_23;
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, nftTokenAccount, metadataAccount, receivingTokenAccount, _a, rewardRecord, rewardVault, rewardTokenAccount, nftTransferAuthority, collectNftReward, err_23;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            rewardToken = poolConfig.getTokenFromSymbol(rewardSymbol);
-                            rewardCustodyMint = rewardToken.mintKey;
+                            rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
                             instructions = [];
                             additionalSigners = [];
                             _b.label = 1;
@@ -5361,7 +5308,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, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                             _a = createUserATA;
                             if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
@@ -5370,7 +5317,7 @@ var PerpetualsClient = (function () {
                             _b.label = 3;
                         case 3:
                             if (_a) {
-                                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));
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint));
                             }
                             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];
@@ -5390,7 +5337,7 @@ var PerpetualsClient = (function () {
                                     rewardTokenAccount: rewardTokenAccount,
                                     transferAuthority: nftTransferAuthority,
                                     systemProgram: web3_js_1.SystemProgram.programId,
-                                    tokenProgram: rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 })
                                     .instruction()];
                         case 4:
@@ -5411,14 +5358,13 @@ var PerpetualsClient = (function () {
         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_24;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, rewardVault, rewardTokenAccount, withdrawStakeInstruction, err_24;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            rewardToken = poolConfig.getTokenFromSymbol(rewardSymbol);
-                            rewardCustodyMint = rewardToken.mintKey;
-                            rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(rewardToken.mintKey); });
+                            rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
+                            rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
@@ -5428,7 +5374,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, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                             _a = createUserATA;
                             if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
@@ -5437,7 +5383,7 @@ var PerpetualsClient = (function () {
                             _b.label = 3;
                         case 3:
                             if (_a) {
-                                preInstructions.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));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint));
                             }
                             tradingAccount = [];
                             if (nftTradingAccount) {
@@ -5556,17 +5502,19 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
-                            _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);
+                            _b.trys.push([1, 6, , 7]);
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, positionAccount.owner)];
+                        case 2:
+                            userReceivingTokenAccount = _b.sent();
                             _a = createUserATA;
-                            if (!_a) return [3, 3];
+                            if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 2:
-                            _a = !(_b.sent());
-                            _b.label = 3;
                         case 3:
+                            _a = !(_b.sent());
+                            _b.label = 4;
+                        case 4:
                             if (_a) {
-                                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));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, positionAccount.owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
                             return [4, this.program.methods
                                     .forceClosePosition({
@@ -5586,26 +5534,25 @@ var PerpetualsClient = (function () {
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    receivingMint: collateralCustodyConfig.mintKey
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .instruction()];
-                        case 4:
+                        case 5:
                             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, 6];
-                        case 5:
+                            return [3, 7];
+                        case 6:
                             err_26 = _b.sent();
                             console.log("perpClient forceClosePosition error:: ", err_26);
                             throw err_26;
-                        case 6: return [2, {
+                        case 7: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5626,28 +5573,30 @@ var PerpetualsClient = (function () {
                             reserveCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey); });
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
-                            userReserveTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, publicKey, false, poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, publicKey)];
+                        case 1:
+                            userReserveTokenAccount = _c.sent();
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _c.label = 1;
-                        case 1:
-                            _c.trys.push([1, 9, , 10]);
-                            if (!(reserveSymbol == 'SOL')) return [3, 4];
+                            _c.label = 2;
+                        case 2:
+                            _c.trys.push([2, 10, , 11]);
+                            if (!(reserveSymbol == 'SOL')) return [3, 5];
                             console.log("reserveSymbol === SOL", reserveSymbol);
                             accCreationLamports = this.minimumBalanceForRentExemptAccountLamports;
                             lamports = reserveAmount.add(new anchor_1.BN(accCreationLamports));
-                            if (!!skipBalanceChecks) return [3, 3];
+                            if (!!skipBalanceChecks) return [3, 4];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 2:
+                        case 3:
                             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 = 4;
+                        case 4:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -5666,22 +5615,22 @@ var PerpetualsClient = (function () {
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
                             additionalSigners.push(wrappedSolAccount);
-                            return [3, 7];
-                        case 4: return [4, (0, utils_1.checkIfAccountExists)(userReserveTokenAccount, this.provider.connection)];
-                        case 5:
+                            return [3, 8];
+                        case 5: return [4, (0, utils_1.checkIfAccountExists)(userReserveTokenAccount, this.provider.connection)];
+                        case 6:
                             if (!(_c.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            if (!!skipBalanceChecks) return [3, 7];
+                            if (!!skipBalanceChecks) return [3, 8];
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userReserveTokenAccount)];
-                        case 6:
+                        case 7:
                             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 = 7;
-                        case 7:
+                            _c.label = 8;
+                        case 8:
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             orderAccount = poolConfig.getOrderFromMarketPk(publicKey, marketAccount);
                             return [4, this.program.methods
@@ -5708,22 +5657,21 @@ var PerpetualsClient = (function () {
                                     reserveOracleAccount: this.useExtOracleAccount ? reserveCustodyConfig.extOracleAccount : reserveCustodyConfig.intOracleAccount,
                                     reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
-                                    tokenProgram: poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    fundingMint: reserveCustodyConfig.mintKey
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .instruction()];
-                        case 8:
+                        case 9:
                             placeLimitOrder = _c.sent();
                             instructions.push(placeLimitOrder);
-                            return [3, 10];
-                        case 9:
+                            return [3, 11];
+                        case 10:
                             err_27 = _c.sent();
                             console.log("perpClient placeLimitOrder error:: ", err_27);
                             throw err_27;
-                        case 10: return [2, {
+                        case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5772,7 +5720,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 5];
                         case 2:
-                            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);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, publicKey, true);
                             _a = createUserATA;
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -5781,7 +5729,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, poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(reserveSymbol).mintKey));
                             }
                             _b.label = 5;
                         case 5:
@@ -5811,11 +5759,10 @@ var PerpetualsClient = (function () {
                                     reserveOracleAccount: this.useExtOracleAccount ? reserveCustodyConfig.extOracleAccount : reserveCustodyConfig.intOracleAccount,
                                     reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
                                     receivingAccount: reserveSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
-                                    tokenProgram: poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    receivingMint: reserveCustodyConfig.mintKey
                                 })
                                     .instruction()];
                         case 6:
@@ -6138,7 +6085,7 @@ var PerpetualsClient = (function () {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             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_34;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, executeTriggerWithSwap, err_34;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -6151,15 +6098,13 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            collateralToken = poolConfig.getTokenFromSymbol(collateralSymbol);
-                            receivingToken = poolConfig.getTokenFromSymbol(receivingSymbol);
                             _d.label = 1;
                         case 1:
                             _d.trys.push([1, 9, , 10]);
                             if (!false) return [3, 2];
                             return [3, 7];
                         case 2:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(receivingToken.mintKey, owner, true, receivingToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(receivingSymbol).mintKey, owner, true);
                             _a = createUserATA;
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -6168,9 +6113,9 @@ var PerpetualsClient = (function () {
                             _d.label = 4;
                         case 4:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, owner, receivingToken.mintKey, receivingToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, owner, poolConfig.getTokenFromSymbol(receivingSymbol).mintKey));
                             }
-                            userReceivingTokenAccountCollateral = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralToken.mintKey, owner, true, collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userReceivingTokenAccountCollateral = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, owner, true);
                             _b = createUserATA;
                             if (!_b) return [3, 6];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccountCollateral, this.provider.connection)];
@@ -6179,7 +6124,7 @@ var PerpetualsClient = (function () {
                             _d.label = 6;
                         case 6:
                             if (_b) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccountCollateral, owner, collateralToken.mintKey, collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccountCollateral, owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
                             _d.label = 7;
                         case 7:
@@ -6223,13 +6168,10 @@ 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,
-                                    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
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
@@ -6271,7 +6213,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, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, owner, true);
                             _a = createUserATA;
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -6280,7 +6222,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, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
                             _b.label = 5;
                         case 5:
@@ -6305,11 +6247,10 @@ var PerpetualsClient = (function () {
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    tokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    receivingMint: collateralCustodyConfig.mintKey
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .instruction()];
                         case 6:
@@ -6413,12 +6354,14 @@ var PerpetualsClient = (function () {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
                         custodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
-                        receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(rewardSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey, publicKey, true)];
+                    case 1:
+                        receivingTokenAccount = _a.sent();
                         instructions = [];
                         additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _a.label = 2;
+                    case 2:
+                        _a.trys.push([2, 4, , 5]);
                         return [4, this.program.methods
                                 .withdrawFees({})
                                 .accounts({
@@ -6430,19 +6373,18 @@ var PerpetualsClient = (function () {
                                 custody: custodyConfig.custodyAccount,
                                 custodyTokenAccount: custodyConfig.tokenAccount,
                                 receivingTokenAccount: receivingTokenAccount,
-                                tokenProgram: poolConfig.getTokenFromSymbol(rewardSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                receivingMint: custodyConfig.mintKey
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
                             })
                                 .instruction()];
-                    case 2:
+                    case 3:
                         withdrawFeesIx = _a.sent();
                         instructions.push(withdrawFeesIx);
-                        return [3, 4];
-                    case 3:
+                        return [3, 5];
+                    case 4:
                         err_38 = _a.sent();
                         console.log("perpClient setPool error:: ", err_38);
                         throw err_38;
-                    case 4: return [2, {
+                    case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -6488,9 +6430,10 @@ 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, err_40;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_40;
+            var _f;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
                         custodyAccountMetas = [];
                         custodyOracleAccountMetas = [];
@@ -6519,36 +6462,38 @@ var PerpetualsClient = (function () {
                         instructions = [];
                         additionalSigners = [];
                         custodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(tokenMint); });
-                        _d.label = 1;
+                        _g.label = 1;
                     case 1:
-                        _d.trys.push([1, 3, , 4]);
-                        return [4, this.program.methods
-                                .reimburse({ amountIn: amountIn })
-                                .accounts({
-                                admin: this.provider.wallet.publicKey,
-                                multisig: poolConfig.multisig,
-                                fundingAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMint, this.provider.wallet.publicKey, true),
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                custody: custodyConfig.custodyAccount,
-                                custodyOracleAccount: this.useExtOracleAccount ? custodyConfig.extOracleAccount : custodyConfig.intOracleAccount,
-                                custodyTokenAccount: custodyConfig.tokenAccount,
-                                tokenProgram: poolConfig.getTokenFromMintPk(tokenMint).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
-                                program: poolConfig.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                fundingMint: custodyConfig.mintKey
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
-                                .instruction()];
-                    case 2:
-                        reimburse = _d.sent();
-                        instructions.push(reimburse);
-                        return [3, 4];
+                        _g.trys.push([1, 4, , 5]);
+                        _e = (_d = this.program.methods
+                            .reimburse({ amountIn: amountIn }))
+                            .accounts;
+                        _f = {
+                            admin: this.provider.wallet.publicKey,
+                            multisig: poolConfig.multisig
+                        };
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(tokenMint, this.provider.wallet.publicKey, true)];
+                    case 2: return [4, _e.apply(_d, [(_f.fundingAccount = _g.sent(),
+                                _f.perpetuals = poolConfig.perpetuals,
+                                _f.pool = poolConfig.poolAddress,
+                                _f.custody = custodyConfig.custodyAccount,
+                                _f.custodyOracleAccount = this.useExtOracleAccount ? custodyConfig.extOracleAccount : custodyConfig.intOracleAccount,
+                                _f.custodyTokenAccount = custodyConfig.tokenAccount,
+                                _f.tokenProgram = spl_token_1.TOKEN_PROGRAM_ID,
+                                _f.program = poolConfig.programId,
+                                _f.ixSysvar = web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                _f)])
+                            .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
+                            .instruction()];
                     case 3:
-                        err_40 = _d.sent();
+                        reimburse = _g.sent();
+                        instructions.push(reimburse);
+                        return [3, 5];
+                    case 4:
+                        err_40 = _g.sent();
                         console.log("perpClient setPool error:: ", err_40);
                         throw err_40;
-                    case 4: return [2, {
+                    case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -6603,23 +6548,22 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, inToken, 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_42;
+                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_42;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            inToken = poolConfig.getTokenFromSymbol(inTokenSymbol);
                             preInstructions = [];
                             instructions = [];
                             additionalSigners = [];
                             postInstructions = [];
                             rewardCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(rewardTokenMint); });
-                            inCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(inToken.mintKey); });
+                            inCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inTokenSymbol).mintKey); });
                             lpTokenMint = poolConfig.stakedLpTokenMint;
                             compoundingTokenMint = poolConfig.compoundingTokenMint;
                             lpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.stakedLpTokenMint, publicKey, true);
                             compoundingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(compoundingTokenMint, publicKey, true);
-                            fundingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inCustodyConfig.mintKey, publicKey, true, inToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            fundingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inCustodyConfig.mintKey, publicKey, true);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
@@ -6718,9 +6662,7 @@ var PerpetualsClient = (function () {
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    fundingMint: inCustodyConfig.mintKey,
-                                    fundingTokenProgram: inToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
@@ -6744,7 +6686,7 @@ var PerpetualsClient = (function () {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, outToken, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, compoundingTokenAccount, removeCompoundingLiquidity, err_43;
+                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_43;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6757,7 +6699,6 @@ var PerpetualsClient = (function () {
                             outCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(outTokenSymbol).mintKey); });
                             lpTokenMint = poolConfig.stakedLpTokenMint;
                             compoundingTokenMint = poolConfig.compoundingTokenMint;
-                            outToken = poolConfig.getTokenFromSymbol(outTokenSymbol);
                             if (!(outCustodyConfig.symbol == 'SOL')) return [3, 1];
                             lamports = this.minimumBalanceForRentExemptAccountLamports;
                             if (!ephemeralSignerPubkey) {
@@ -6779,7 +6720,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 4];
                         case 1:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(outCustodyConfig.mintKey, publicKey, true, outToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(outCustodyConfig.mintKey, publicKey, true);
                             _a = createUserATA;
                             if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -6788,7 +6729,7 @@ var PerpetualsClient = (function () {
                             _e.label = 3;
                         case 3:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, outCustodyConfig.mintKey, outToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, outCustodyConfig.mintKey));
                             }
                             _e.label = 4;
                         case 4:
@@ -6843,9 +6784,7 @@ var PerpetualsClient = (function () {
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                                    receivingMint: outCustodyConfig.mintKey,
-                                    receivingTokenProgram: outToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
@@ -7243,19 +7182,18 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.rewardDistribution = function (counter, owner, rewardAmount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardToken, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, rewardRecord, distributeReward, err_50;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, rewardRecord, distributeReward, err_50;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
-                        rewardToken = poolConfig.getTokenFromSymbol(rewardSymbol);
-                        rewardCustodyMint = rewardToken.mintKey;
+                        rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
                         instructions = [];
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        fundingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                        fundingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                         rewardVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_vault")], this.programRewardDistribution.programId)[0];
                         rewardTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_token_account")], this.programRewardDistribution.programId)[0];
                         rewardRecord = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_record"), owner.toBuffer(), rewardVault.toBuffer(), counter.toArrayLike(Buffer, 'le', 8)], this.programRewardDistribution.programId)[0];
@@ -7272,7 +7210,7 @@ var PerpetualsClient = (function () {
                                 rewardTokenAccount: rewardTokenAccount,
                                 rewardRecord: rewardRecord,
                                 systemProgram: web3_js_1.SystemProgram.programId,
-                                tokenProgram: rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                                 eventAuthority: this.eventAuthorityRewardDistribution.publicKey,
                                 program: this.programRewardDistribution.programId
@@ -7296,19 +7234,18 @@ var PerpetualsClient = (function () {
         this.collectReward = function (counter, owner, rewardSymbol, poolConfig, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, rewardToken, rewardCustodyMint, instructions, additionalSigners, receivingTokenAccount, _a, rewardVault, rewardTokenAccount, rewardRecord, transferAuthority, collectRaffleReward, err_51;
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, receivingTokenAccount, _a, rewardVault, rewardTokenAccount, rewardRecord, transferAuthority, collectRaffleReward, err_51;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            rewardToken = poolConfig.getTokenFromSymbol(rewardSymbol);
-                            rewardCustodyMint = rewardToken.mintKey;
+                            rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
                             instructions = [];
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 5, , 6]);
-                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true, rewardToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                             _a = createUserATA;
                             if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
@@ -7317,7 +7254,7 @@ var PerpetualsClient = (function () {
                             _b.label = 3;
                         case 3:
                             if (_a) {
-                                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));
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint));
                             }
                             rewardVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_vault")], this.programRewardDistribution.programId)[0];
                             rewardTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_token_account")], this.programRewardDistribution.programId)[0];