flash-sdk 11.11.4-alpha.0 → 11.12.2-alpha.0

package/dist/PerpetualsClient.js

@@ -2700,7 +2700,7 @@ var PerpetualsClient = (function () {
             for (var _i = 8; _i < arguments.length; _i++) {
                 args_1[_i - 8] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, priceWithSlippage_1, collateralWithfee_1, size_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, priceWithSlippage, collateralWithfee, size, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, priceWithSlippage_1, collateralWithfee_1, size_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, priceWithSlippage, collateralWithfee, size, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, skipBalanceChecks, ephemeralSignerPubkey) {
                 var publicKey, targetCustodyConfig, collateralCustodyConfig, collateralToken, marketAccount, userCollateralTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, params, instruction;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
@@ -2709,7 +2709,7 @@ var PerpetualsClient = (function () {
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            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);
@@ -2814,48 +2814,59 @@ var PerpetualsClient = (function () {
             for (var _i = 6; _i < arguments.length; _i++) {
                 args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([marketSymbol_1, collateralSymbol_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (marketSymbol, collateralSymbol, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey, userPublicKey) {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, instruction, closeWsolATAIns, error_1;
+            return __awaiter(_this, __spreadArray([marketSymbol_1, collateralSymbol_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (marketSymbol, collateralSymbol, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, instruction, closeWsolATAIns, error_1;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            console.log("close position :::", marketSymbol, poolConfig.getTokenFromSymbol(marketSymbol).mintKey.toBase58());
+                            publicKey = this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
-                            if (collateralSymbol == 'SOL') {
-                                lamports = (this.minimumBalanceForRentExemptAccountLamports);
-                                if (!ephemeralSignerPubkey) {
-                                    wrappedSolAccount = new web3_js_1.Keypair();
-                                    additionalSigners.push(wrappedSolAccount);
-                                }
-                                preInstructions = [
-                                    web3_js_1.SystemProgram.createAccount({
-                                        fromPubkey: publicKey,
-                                        newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                        lamports: lamports,
-                                        space: 165,
-                                        programId: spl_token_1.TOKEN_PROGRAM_ID,
-                                    }),
-                                    (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
-                                ];
-                                postInstructions = [
-                                    (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
-                                ];
+                            _b.trys.push([1, 7, , 8]);
+                            if (!(collateralSymbol == 'SOL')) return [3, 2];
+                            lamports = (this.minimumBalanceForRentExemptAccountLamports);
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
+                                additionalSigners.push(wrappedSolAccount);
                             }
-                            else {
-                                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);
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(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 = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports,
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
+                            ];
+                            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);
+                            _a = createUserATA;
+                            if (!_a) return [3, 4];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
+                            _a = !(_b.sent());
+                            _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));
                             }
+                            _b.label = 5;
+                        case 5:
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
@@ -2887,19 +2898,19 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
-                        case 2:
-                            instruction = _a.sent();
+                        case 6:
+                            instruction = _b.sent();
                             instructions.push(instruction);
                             if (collateralSymbol == 'WSOL' && closeUsersWSOLATA) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
                                 postInstructions.push(closeWsolATAIns);
                             }
-                            return [3, 4];
-                        case 3:
-                            error_1 = _a.sent();
+                            return [3, 8];
+                        case 7:
+                            error_1 = _b.sent();
                             console.error("perpclient closePosition error:", error_1);
                             throw error_1;
-                        case 4: return [2, {
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -2912,7 +2923,7 @@ var PerpetualsClient = (function () {
             for (var _i = 9; _i < arguments.length; _i++) {
                 args_1[_i - 9] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, priceWithSlippage, sizeAmount, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
+            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, collateralTokenSymbol_1, userInputTokenSymbol_1, amountIn_1, priceWithSlippage_1, sizeAmount_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, priceWithSlippage, sizeAmount, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, skipBalanceChecks, ephemeralSignerPubkey) {
                 var publicKey, userInputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, targetToken, userInputTokenAccount, userInputToken, lamports, unWrappedSolBalance, _a, userOutputTokenAccount, tokenAccountBalance, _b, userOutputTokenAccount, inx, err_3;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
@@ -2921,7 +2932,7 @@ var PerpetualsClient = (function () {
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             userInputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey); });
                             if (!userInputCustodyConfig) {
                                 throw "userInputCustodyConfig not found";
@@ -2945,7 +2956,7 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             targetToken = poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol);
                             userInputToken = poolConfig.getTokenFromSymbol(userInputTokenSymbol);
-                            if (!(userInputTokenSymbol == 'SOL')) return [3, 3];
+                            if (!(userInputTokenSymbol == 'SOL')) return [3, 5];
                             console.log("inputSymbol === SOL", userInputTokenSymbol);
                             lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
                             if (!!skipBalanceChecks) return [3, 2];
@@ -2975,33 +2986,41 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            if (!poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey.equals(spl_token_1.NATIVE_MINT)) {
-                                userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
-                            }
-                            return [3, 7];
+                            if (!!poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey.equals(spl_token_1.NATIVE_MINT)) return [3, 4];
+                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
                         case 3:
+                            if (!(_c.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey));
+                            }
+                            _c.label = 4;
+                        case 4: return [3, 10];
+                        case 5:
                             userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(userInputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                            if (!!skipBalanceChecks) return [3, 6];
+                            if (!!skipBalanceChecks) return [3, 8];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
-                        case 4:
+                        case 6:
                             if (!(_c.sent())) {
                                 throw "Insufficient Funds , Token Account doesn't exist";
                             }
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
-                        case 5:
+                        case 7:
                             tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_c.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(amountIn)) {
                                 throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            _c.label = 6;
-                        case 6:
+                            _c.label = 8;
+                        case 8:
                             userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
-                            _c.label = 7;
-                        case 7:
-                            _c.trys.push([7, 9, , 10]);
+                            return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
+                        case 9:
+                            if (!(_c.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            }
+                            _c.label = 10;
+                        case 10:
+                            _c.trys.push([10, 12, , 13]);
                             return [4, this.program.methods
                                     .swapAndOpen({
                                     amountIn: amountIn,
@@ -3037,15 +3056,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
-                        case 8:
+                        case 11:
                             inx = _c.sent();
                             instructions.push(inx);
-                            return [3, 10];
-                        case 9:
+                            return [3, 13];
+                        case 12:
                             err_3 = _c.sent();
                             console.error("perpClient SwapAndOpen error:: ", err_3);
                             throw err_3;
-                        case 10: return [2, {
+                        case 13: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -3058,7 +3077,7 @@ var PerpetualsClient = (function () {
             for (var _i = 7; _i < arguments.length; _i++) {
                 args_1[_i - 7] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, userOutputTokenSymbol_1, collateralTokenSymbol_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, userOutputTokenSymbol, collateralTokenSymbol, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, ephemeralSignerPubkey, userPublicKey) {
+            return __awaiter(_this, __spreadArray([targetTokenSymbol_1, userOutputTokenSymbol_1, collateralTokenSymbol_1, priceWithSlippage_1, side_1, poolConfig_1, privilege_1], args_1, true), void 0, function (targetTokenSymbol, userOutputTokenSymbol, collateralTokenSymbol, priceWithSlippage, side, poolConfig, privilege, tokenStakeAccount, userReferralAccount, ephemeralSignerPubkey) {
                 var publicKey, userOutputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, collateralToken, userOutputToken, lamports, userCollateralTokenAccount, inx, err_4;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
@@ -3066,7 +3085,7 @@ var PerpetualsClient = (function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             userOutputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey); });
                             if (!userOutputCustodyConfig) {
                                 throw "userOutputCustodyConfig not found";
@@ -3090,37 +3109,46 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             collateralToken = poolConfig.getTokenFromSymbol(collateralTokenSymbol);
                             userOutputToken = poolConfig.getTokenFromSymbol(userOutputTokenSymbol);
-                            if (userOutputTokenSymbol == 'SOL') {
-                                console.log("outputSymbol === SOL", userOutputTokenSymbol);
-                                lamports = (this.minimumBalanceForRentExemptAccountLamports);
-                                if (!ephemeralSignerPubkey) {
-                                    wrappedSolAccount = new web3_js_1.Keypair();
-                                    additionalSigners.push(wrappedSolAccount);
-                                }
-                                preInstructions = [
-                                    web3_js_1.SystemProgram.createAccount({
-                                        fromPubkey: publicKey,
-                                        newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                        lamports: lamports,
-                                        space: 165,
-                                        programId: spl_token_1.TOKEN_PROGRAM_ID,
-                                    }),
-                                    (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
-                                ];
-                                postInstructions = [
-                                    (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
-                                ];
+                            if (!(userOutputTokenSymbol == 'SOL')) return [3, 1];
+                            console.log("outputSymbol === SOL", userOutputTokenSymbol);
+                            lamports = (this.minimumBalanceForRentExemptAccountLamports);
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
                             }
-                            else {
-                                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);
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userReceivingTokenAccount, publicKey, userOutputToken.mintKey, userOutputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports,
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (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)];
+                        case 2:
+                            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));
                             }
+                            _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);
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralToken.mintKey, collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 4:
+                            if (!(_a.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralToken.mintKey, collateralToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            }
+                            _a.label = 5;
+                        case 5:
+                            _a.trys.push([5, 7, , 8]);
                             return [4, this.program.methods
                                     .closeAndSwap({
                                     priceWithSlippage: priceWithSlippage,
@@ -3154,15 +3182,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
-                        case 2:
+                        case 6:
                             inx = _a.sent();
                             instructions.push(inx);
-                            return [3, 4];
-                        case 3:
+                            return [3, 8];
+                        case 7:
                             err_4 = _a.sent();
                             console.error("perpClient CloseAndSwap error:: ", err_4);
                             throw err_4;
-                        case 4: return [2, {
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -3175,14 +3203,14 @@ var PerpetualsClient = (function () {
             for (var _i = 6; _i < arguments.length; _i++) {
                 args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([collateralWithFee_1, targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralWithFee, targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
+            return __awaiter(_this, __spreadArray([collateralWithFee_1, targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralWithFee, targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, userPayingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, instruction;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
@@ -3278,14 +3306,14 @@ var PerpetualsClient = (function () {
             for (var _i = 7; _i < arguments.length; _i++) {
                 args_1[_i - 7] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, inputSymbol, collateralSymbol, amountIn, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, inputSymbol, collateralSymbol, amountIn, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, marketAccount, instruction;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
                             inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
@@ -3349,7 +3377,11 @@ var PerpetualsClient = (function () {
                             _c.label = 6;
                         case 6:
                             userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralCustodyConfig.mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 7:
+                            if (!(_c.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralCustodyConfig.mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            }
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.program.methods.swapAndAddCollateral({
                                     amountIn: amountIn,
@@ -3377,7 +3409,7 @@ var PerpetualsClient = (function () {
                                     fundingMint: poolConfig.getTokenFromSymbol(inputSymbol).mintKey,
                                 })
                                     .instruction()];
-                        case 7:
+                        case 8:
                             instruction = _c.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -3393,15 +3425,15 @@ var PerpetualsClient = (function () {
             for (var _i = 6; _i < arguments.length; _i++) {
                 args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([collateralDeltaUsd_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralDeltaUsd, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey, userPublicKey) {
-                var publicKey, collateralCustodyConfig, targetCustodyConfig, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, marketAccount, instruction, closeWsolATAIns, error_2;
+            return __awaiter(_this, __spreadArray([collateralDeltaUsd_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralDeltaUsd, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, marketAccount, instruction, closeWsolATAIns, error_2;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) {
                                 return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey);
                             });
@@ -3415,35 +3447,45 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _b.trys.push([1, 7, , 8]);
                             console.log("removeCollateral  -- collateralSymbol:", collateralSymbol);
-                            if (collateralSymbol == 'SOL') {
-                                console.log("remove collateral in SOL ...create WSOL temp and close it ");
-                                lamports = this.minimumBalanceForRentExemptAccountLamports;
-                                if (!ephemeralSignerPubkey) {
-                                    wrappedSolAccount = new web3_js_1.Keypair();
-                                    additionalSigners.push(wrappedSolAccount);
-                                }
-                                preInstructions = [
-                                    web3_js_1.SystemProgram.createAccount({
-                                        fromPubkey: publicKey,
-                                        newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                        lamports: lamports,
-                                        space: 165,
-                                        programId: spl_token_1.TOKEN_PROGRAM_ID,
-                                    }),
-                                    (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
-                                ];
-                                postInstructions = [
-                                    (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
-                                ];
+                            if (!(collateralSymbol == 'SOL')) return [3, 2];
+                            console.log("remove collateral in SOL ...create WSOL temp and close it ");
+                            lamports = this.minimumBalanceForRentExemptAccountLamports;
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
+                                additionalSigners.push(wrappedSolAccount);
                             }
-                            else {
-                                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);
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(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 = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports,
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
+                            ];
+                            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);
+                            _a = createUserATA;
+                            if (!_a) return [3, 4];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
+                            _a = !(_b.sent());
+                            _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));
                             }
+                            _b.label = 5;
+                        case 5:
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.program.methods
                                     .removeCollateral({
@@ -3469,19 +3511,19 @@ var PerpetualsClient = (function () {
                                     receivingMint: collateralCustodyConfig.mintKey
                                 })
                                     .instruction()];
-                        case 2:
-                            instruction = _a.sent();
+                        case 6:
+                            instruction = _b.sent();
                             instructions.push(instruction);
                             if (collateralSymbol == 'WSOL' && closeUsersWSOLATA) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
                                 postInstructions.push(closeWsolATAIns);
                             }
-                            return [3, 4];
-                        case 3:
-                            error_2 = _a.sent();
+                            return [3, 8];
+                        case 7:
+                            error_2 = _b.sent();
                             console.error("perpclient removeCollateral error:", error_2);
                             throw error_2;
-                        case 4: return [2, {
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -3494,13 +3536,13 @@ var PerpetualsClient = (function () {
             for (var _i = 6; _i < arguments.length; _i++) {
                 args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, outputSymbol_1, collateralDeltaUsd_1, side_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, outputSymbol, collateralDeltaUsd, side, poolConfig, ephemeralSignerPubkey, userPublicKey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, outputSymbol_1, collateralDeltaUsd_1, side_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, outputSymbol, collateralDeltaUsd, side, poolConfig, ephemeralSignerPubkey) {
                 var publicKey, targetCustodyConfig, collateralCustodyConfig, outputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, marketAccount, positionAccount, instruction;
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            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); });
                             outputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(outputSymbol).mintKey); });
@@ -3511,33 +3553,42 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            if (outputSymbol == 'SOL') {
-                                console.log("outputSymbol === SOL", outputSymbol);
-                                lamports = this.minimumBalanceForRentExemptAccountLamports;
-                                if (!ephemeralSignerPubkey) {
-                                    wrappedSolAccount = new web3_js_1.Keypair();
-                                    additionalSigners.push(wrappedSolAccount);
-                                }
-                                preInstructions = [
-                                    web3_js_1.SystemProgram.createAccount({
-                                        fromPubkey: publicKey,
-                                        newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                        lamports: lamports,
-                                        space: 165,
-                                        programId: spl_token_1.TOKEN_PROGRAM_ID,
-                                    }),
-                                    (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
-                                ];
-                                postInstructions = [
-                                    (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
-                                ];
+                            if (!(outputSymbol == 'SOL')) return [3, 1];
+                            console.log("outputSymbol === SOL", outputSymbol);
+                            lamports = this.minimumBalanceForRentExemptAccountLamports;
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
+                                additionalSigners.push(wrappedSolAccount);
                             }
-                            else {
-                                userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(outputSymbol).mintKey, poolConfig.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports,
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
+                            ];
+                            return [3, 3];
+                        case 1:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 2:
+                            if (!(_a.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(outputSymbol).mintKey, poolConfig.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
+                            _a.label = 3;
+                        case 3:
                             userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 4:
+                            if (!(_a.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            }
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             return [4, this.program.methods
@@ -3571,7 +3622,7 @@ var PerpetualsClient = (function () {
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
                                 })
                                     .instruction()];
-                        case 1:
+                        case 5:
                             instruction = _a.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -3587,14 +3638,14 @@ var PerpetualsClient = (function () {
             for (var _i = 8; _i < arguments.length; _i++) {
                 args_1[_i - 8] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, positionPubKey_1, side_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, positionPubKey, side, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount, userPublicKey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, positionPubKey_1, side_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, positionPubKey, side, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount) {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, instruction;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) {
                                 return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey);
                             });
@@ -3651,14 +3702,14 @@ var PerpetualsClient = (function () {
             for (var _i = 8; _i < arguments.length; _i++) {
                 args_1[_i - 8] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount, userPublicKey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1, priceWithSlippage_1, sizeDelta_1, privilege_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, priceWithSlippage, sizeDelta, privilege, tokenStakeAccount, userReferralAccount) {
                 var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, instruction;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) {
                                 return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey);
                             });
@@ -3715,7 +3766,7 @@ var PerpetualsClient = (function () {
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([payTokenSymbol_1, tokenAmountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (payTokenSymbol, tokenAmountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, isWhitelistedUser, userPublicKey) {
+            return __awaiter(_this, __spreadArray([payTokenSymbol_1, tokenAmountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (payTokenSymbol, tokenAmountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, isWhitelistedUser) {
                 var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, payToken, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, tokenAccountBalance, _f, whitelistPda, whitelistMeta, instruction, err_5;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
@@ -3723,7 +3774,7 @@ var PerpetualsClient = (function () {
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             payTokenCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey); });
                             if (!payTokenCustodyConfig) {
                                 throw "payTokenCustodyConfig not found";
@@ -3735,7 +3786,7 @@ var PerpetualsClient = (function () {
                             payToken = poolConfig.getTokenFromSymbol(payTokenSymbol);
                             _g.label = 1;
                         case 1:
-                            _g.trys.push([1, 9, , 10]);
+                            _g.trys.push([1, 10, , 11]);
                             userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(payTokenCustodyConfig.mintKey, publicKey, true, payToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             lpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.stakedLpTokenMint, publicKey, true);
                             custodyAccountMetas = [];
@@ -3762,20 +3813,24 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint, spl_token_1.TOKEN_PROGRAM_ID));
-                            if (!(payTokenSymbol == 'SOL')) return [3, 4];
+                            return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
+                        case 2:
+                            if (!(_g.sent())) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
+                            }
+                            if (!(payTokenSymbol == 'SOL')) return [3, 5];
                             console.log("payTokenSymbol === SOL", payTokenSymbol);
                             lamports = tokenAmountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
-                            if (!!skipBalanceChecks) return [3, 3];
+                            if (!!skipBalanceChecks) return [3, 4];
                             _e = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 2:
+                        case 3:
                             unWrappedSolBalance = new (_e.apply(anchor_1.BN, [void 0, _g.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _g.label = 3;
-                        case 3:
+                            _g.label = 4;
+                        case 4:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -3793,23 +3848,23 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 7];
-                        case 4:
-                            if (!!skipBalanceChecks) return [3, 7];
-                            return [4, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
+                            return [3, 8];
                         case 5:
+                            if (!!skipBalanceChecks) return [3, 8];
+                            return [4, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
+                        case 6:
                             if (!(_g.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
                             _f = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userPayingTokenAccount)];
-                        case 6:
+                        case 7:
                             tokenAccountBalance = new (_f.apply(anchor_1.BN, [void 0, (_g.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(tokenAmountIn)) {
                                 throw "Insufficient Funds need more ".concat(tokenAmountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            _g.label = 7;
-                        case 7:
+                            _g.label = 8;
+                        case 8:
                             whitelistPda = this.findProgramAddress("whitelist", [publicKey]).publicKey;
                             whitelistMeta = {
                                 pubkey: whitelistPda,
@@ -3841,15 +3896,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
-                        case 8:
+                        case 9:
                             instruction = _g.sent();
                             instructions.push(instruction);
-                            return [3, 10];
-                        case 9:
+                            return [3, 11];
+                        case 10:
                             err_5 = _g.sent();
                             console.error("perpClient addLiquidity error:: ", err_5);
                             throw err_5;
-                        case 10: return [2, {
+                        case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -3882,7 +3937,7 @@ var PerpetualsClient = (function () {
                             inputToken = poolConfig.getTokenFromSymbol(inputSymbol);
                             flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
                             poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
-                            if (!(inputSymbol == 'SOL')) return [3, 3];
+                            if (!(inputSymbol == 'SOL')) return [3, 4];
                             console.log("inputSymbol === SOL", inputSymbol);
                             lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
                             console.log("lamports:", lamports.toNumber());
@@ -3895,8 +3950,11 @@ var PerpetualsClient = (function () {
                                 throw "Insufficient SOL Funds";
                             }
                             _g.label = 2;
-                        case 2:
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint, spl_token_1.TOKEN_PROGRAM_ID));
+                        case 2: return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
+                        case 3:
+                            if (!(_g.sent())) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
+                            }
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -3914,24 +3972,24 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 6];
-                        case 3:
+                            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);
-                            if (!!skipBalanceChecks) return [3, 6];
+                            if (!!skipBalanceChecks) return [3, 7];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
-                        case 4:
+                        case 5:
                             if (!(_g.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
-                        case 5:
+                        case 6:
                             tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_g.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(amountIn)) {
                                 throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            _g.label = 6;
-                        case 6:
+                            _g.label = 7;
+                        case 7:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
@@ -3988,7 +4046,7 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
-                        case 7:
+                        case 8:
                             instruction = _g.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -4471,12 +4529,12 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.unstakeRequest = function (unstakeAmount, poolConfig, userPublicKey) { return __awaiter(_this, void 0, void 0, function () {
+        this.unstakeRequest = function (unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_13;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                        publicKey = this.provider.wallet.publicKey;
                         preInstructions = [];
                         instructions = [];
                         postInstructions = [];
@@ -4595,10 +4653,10 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, tokenStakeAccount_1], args_1, true), void 0, function (rewardSymbol, poolConfig, tokenStakeAccount, createUserATA) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, tokenStakeAccounts, withdrawStakeInstruction, err_15;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tokenStakeAccounts, withdrawStakeInstruction, err_15;
                 if (createUserATA === void 0) { createUserATA = true; }
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
                             rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
@@ -4607,13 +4665,22 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _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);
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint, spl_token_1.TOKEN_PROGRAM_ID));
+                            _a = createUserATA;
+                            if (!_a) return [3, 3];
+                            return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
+                        case 2:
+                            _a = !(_b.sent());
+                            _b.label = 3;
+                        case 3:
+                            if (_a) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint));
+                            }
                             tokenStakeAccounts = [];
                             if (tokenStakeAccount) {
                                 tokenStakeAccounts.push({
@@ -4642,15 +4709,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray([], tokenStakeAccounts, true))
                                     .instruction()];
-                        case 2:
-                            withdrawStakeInstruction = _a.sent();
+                        case 4:
+                            withdrawStakeInstruction = _b.sent();
                             instructions.push(withdrawStakeInstruction);
-                            return [3, 4];
-                        case 3:
-                            err_15 = _a.sent();
+                            return [3, 6];
+                        case 5:
+                            err_15 = _b.sent();
                             console.log("perpClient withdrawStake error:: ", err_15);
                             throw err_15;
-                        case 4: return [2, {
+                        case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -4709,21 +4776,29 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint, spl_token_1.TOKEN_PROGRAM_ID));
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, compoundingTokenAccount, publicKey, poolConfig.compoundingTokenMint, spl_token_1.TOKEN_PROGRAM_ID));
-                            if (!(inTokenSymbol == 'SOL')) return [3, 3];
+                            return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
+                        case 1:
+                            if (!(_f.sent())) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
+                            }
+                            return [4, (0, utils_1.checkIfAccountExists)(compoundingTokenAccount, this.provider.connection)];
+                        case 2:
+                            if (!(_f.sent())) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, compoundingTokenAccount, publicKey, poolConfig.compoundingTokenMint));
+                            }
+                            if (!(inTokenSymbol == 'SOL')) return [3, 5];
                             console.log("inTokenSymbol === SOL", inTokenSymbol);
                             lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
-                            if (!!skipBalanceChecks) return [3, 2];
+                            if (!!skipBalanceChecks) return [3, 4];
                             _e = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 1:
+                        case 3:
                             unWrappedSolBalance = new (_e.apply(anchor_1.BN, [void 0, _f.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _f.label = 2;
-                        case 2:
+                            _f.label = 4;
+                        case 4:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -4741,17 +4816,17 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 5];
-                        case 3:
-                            if (!!skipBalanceChecks) return [3, 5];
+                            return [3, 7];
+                        case 5:
+                            if (!!skipBalanceChecks) return [3, 7];
                             return [4, (0, utils_1.checkIfAccountExists)(fundingAccount, this.provider.connection)];
-                        case 4:
+                        case 6:
                             if (!(_f.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            _f.label = 5;
-                        case 5:
-                            _f.trys.push([5, 7, , 8]);
+                            _f.label = 7;
+                        case 7:
+                            _f.trys.push([7, 9, , 10]);
                             if (enableHeapSizeIx) {
                                 heapSizeIx = web3_js_1.ComputeBudgetProgram.requestHeapFrame({
                                     bytes: 64 * 1024,
@@ -4793,15 +4868,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
-                        case 6:
+                        case 8:
                             addCompoundingLiquidity = _f.sent();
                             instructions.push(addCompoundingLiquidity);
-                            return [3, 8];
-                        case 7:
+                            return [3, 10];
+                        case 9:
                             err_16 = _f.sent();
                             console.log("perpClient addCompoundingLiquidity error:: ", err_16);
-                            return [3, 8];
-                        case 8: return [2, {
+                            return [3, 10];
+                        case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -4815,14 +4890,14 @@ var PerpetualsClient = (function () {
                 args_1[_i - 5] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([compoundingAmountIn_1, minAmountOut_1, outTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (compoundingAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA, ephemeralSignerPubkey, userPublicKey, enableHeapSizeIx, isWhitelistedUser) {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, compoundingTokenAccount, heapSizeIx, whitelistPda, whitelistMeta, removeCompoundingLiquidity, err_17;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, compoundingTokenAccount, heapSizeIx, whitelistPda, whitelistMeta, removeCompoundingLiquidity, err_17;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableHeapSizeIx === void 0) { enableHeapSizeIx = true; }
                 if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
@@ -4833,35 +4908,45 @@ var PerpetualsClient = (function () {
                             outCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(outTokenSymbol).mintKey); });
                             lpTokenMint = poolConfig.stakedLpTokenMint;
                             compoundingTokenMint = poolConfig.compoundingTokenMint;
-                            if (outCustodyConfig.symbol == 'SOL') {
-                                lamports = this.minimumBalanceForRentExemptAccountLamports;
-                                if (!ephemeralSignerPubkey) {
-                                    wrappedSolAccount = new web3_js_1.Keypair();
-                                    additionalSigners.push(wrappedSolAccount);
-                                }
-                                preInstructions = [
-                                    web3_js_1.SystemProgram.createAccount({
-                                        fromPubkey: publicKey,
-                                        newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                        lamports: lamports,
-                                        space: 165,
-                                        programId: spl_token_1.TOKEN_PROGRAM_ID,
-                                    }),
-                                    (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
-                                ];
-                                postInstructions = [
-                                    (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
-                                ];
+                            if (!(outCustodyConfig.symbol == 'SOL')) return [3, 1];
+                            lamports = this.minimumBalanceForRentExemptAccountLamports;
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
+                                additionalSigners.push(wrappedSolAccount);
                             }
-                            else {
-                                userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(outCustodyConfig.mintKey, publicKey, true, poolConfig.getTokenFromSymbol(outTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userReceivingTokenAccount, publicKey, outCustodyConfig.mintKey, poolConfig.getTokenFromSymbol(outTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports,
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
+                            ];
+                            return [3, 4];
+                        case 1:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(outCustodyConfig.mintKey, publicKey, true, poolConfig.getTokenFromSymbol(outTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            _a = createUserATA;
+                            if (!_a) return [3, 3];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 2:
+                            _a = !(_f.sent());
+                            _f.label = 3;
+                        case 3:
+                            if (_a) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, outCustodyConfig.mintKey, poolConfig.getTokenFromSymbol(outTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
                             }
+                            _f.label = 4;
+                        case 4:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
-                            for (_a = 0, _b = poolConfig.custodies; _a < _b.length; _a++) {
-                                custody = _b[_a];
+                            for (_b = 0, _c = poolConfig.custodies; _b < _c.length; _b++) {
+                                custody = _c[_b];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -4873,8 +4958,8 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            for (_c = 0, _d = poolConfig.markets; _c < _d.length; _c++) {
-                                market = _d[_c];
+                            for (_d = 0, _e = poolConfig.markets; _d < _e.length; _d++) {
+                                market = _e[_d];
                                 markets.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
@@ -4882,9 +4967,9 @@ var PerpetualsClient = (function () {
                                 });
                             }
                             compoundingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(compoundingTokenMint, publicKey, true);
-                            _e.label = 1;
-                        case 1:
-                            _e.trys.push([1, 3, , 4]);
+                            _f.label = 5;
+                        case 5:
+                            _f.trys.push([5, 7, , 8]);
                             if (enableHeapSizeIx) {
                                 heapSizeIx = web3_js_1.ComputeBudgetProgram.requestHeapFrame({
                                     bytes: 64 * 1024,
@@ -4926,15 +5011,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
-                        case 2:
-                            removeCompoundingLiquidity = _e.sent();
+                        case 6:
+                            removeCompoundingLiquidity = _f.sent();
                             instructions.push(removeCompoundingLiquidity);
-                            return [3, 4];
-                        case 3:
-                            err_17 = _e.sent();
+                            return [3, 8];
+                        case 7:
+                            err_17 = _f.sent();
                             console.log("perpClient removeCompoundingLiquidity error:: ", err_17);
-                            return [3, 4];
-                        case 4: return [2, {
+                            return [3, 8];
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -4947,13 +5032,13 @@ var PerpetualsClient = (function () {
             for (var _i = 3; _i < arguments.length; _i++) {
                 args_1[_i - 3] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([amount_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amount, rewardTokenMint, poolConfig, createUserATA, userPublicKey) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _a, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, migrateStake, err_18;
+            return __awaiter(_this, __spreadArray([amount_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amount, rewardTokenMint, poolConfig, createUserATA) {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _b, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, migrateStake, err_18;
                 if (createUserATA === void 0) { createUserATA = true; }
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
@@ -4962,18 +5047,27 @@ var PerpetualsClient = (function () {
                             lpTokenMint = poolConfig.stakedLpTokenMint;
                             compoundingTokenMint = poolConfig.compoundingTokenMint;
                             compoudingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(compoundingTokenMint, publicKey, true);
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, compoudingTokenAccount, publicKey, compoundingTokenMint, spl_token_1.TOKEN_PROGRAM_ID));
-                            flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
-                            tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), publicKey.toBuffer()], this.programId)[0];
-                            tokenStakeAccounts = [];
-                            _a = tokenStakeAccount;
+                            _a = createUserATA;
                             if (!_a) return [3, 2];
-                            return [4, (0, utils_1.checkIfAccountExists)(tokenStakeAccount, this.provider.connection)];
+                            return [4, (0, utils_1.checkIfAccountExists)(compoudingTokenAccount, this.provider.connection)];
                         case 1:
-                            _a = (_f.sent());
-                            _f.label = 2;
+                            _a = !(_g.sent());
+                            _g.label = 2;
                         case 2:
                             if (_a) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, compoudingTokenAccount, publicKey, compoundingTokenMint));
+                            }
+                            flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
+                            tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), publicKey.toBuffer()], this.programId)[0];
+                            tokenStakeAccounts = [];
+                            _b = tokenStakeAccount;
+                            if (!_b) return [3, 4];
+                            return [4, (0, utils_1.checkIfAccountExists)(tokenStakeAccount, this.provider.connection)];
+                        case 3:
+                            _b = (_g.sent());
+                            _g.label = 4;
+                        case 4:
+                            if (_b) {
                                 tokenStakeAccounts.push({
                                     pubkey: tokenStakeAccount,
                                     isSigner: false,
@@ -4984,8 +5078,8 @@ var PerpetualsClient = (function () {
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
-                            for (_b = 0, _c = poolConfig.custodies; _b < _c.length; _b++) {
-                                custody = _c[_b];
+                            for (_c = 0, _d = poolConfig.custodies; _c < _d.length; _c++) {
+                                custody = _d[_c];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -4997,17 +5091,17 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            for (_d = 0, _e = poolConfig.markets; _d < _e.length; _d++) {
-                                market = _e[_d];
+                            for (_e = 0, _f = poolConfig.markets; _e < _f.length; _e++) {
+                                market = _f[_e];
                                 markets.push({
                                     pubkey: market.marketAccount,
                                     isSigner: false,
                                     isWritable: false,
                                 });
                             }
-                            _f.label = 3;
-                        case 3:
-                            _f.trys.push([3, 5, , 6]);
+                            _g.label = 5;
+                        case 5:
+                            _g.trys.push([5, 7, , 8]);
                             return [4, this.program.methods
                                     .migrateStake({
                                     amount: amount
@@ -5032,15 +5126,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), tokenStakeAccounts, true))
                                     .instruction()];
-                        case 4:
-                            migrateStake = _f.sent();
+                        case 6:
+                            migrateStake = _g.sent();
                             instructions.push(migrateStake);
-                            return [3, 6];
-                        case 5:
-                            err_18 = _f.sent();
+                            return [3, 8];
+                        case 7:
+                            err_18 = _g.sent();
                             console.log("perpClient migrateStake error:: ", err_18);
-                            return [3, 6];
-                        case 6: return [2, {
+                            return [3, 8];
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5048,12 +5142,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.migrateFlp = function (amount, rewardTokenMint, poolConfig, userPublicKey) { return __awaiter(_this, void 0, void 0, function () {
+        this.migrateFlp = function (amount, rewardTokenMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_19;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                        publicKey = this.provider.wallet.publicKey;
                         preInstructions = [];
                         instructions = [];
                         postInstructions = [];
@@ -5217,10 +5311,14 @@ var PerpetualsClient = (function () {
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _a.trys.push([1, 4, , 5]);
                         tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
                         userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.tokenMint, owner, true);
-                        preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(feePayer, userTokenAccount, owner, poolConfig.tokenMint, spl_token_1.TOKEN_PROGRAM_ID));
+                        return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                    case 2:
+                        if (!(_a.sent())) {
+                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(feePayer, userTokenAccount, owner, poolConfig.tokenMint));
+                        }
                         return [4, this.program.methods
                                 .depositTokenStake({
                                 depositAmount: depositAmount
@@ -5240,15 +5338,15 @@ var PerpetualsClient = (function () {
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
-                    case 2:
+                    case 3:
                         depositTokenStakeInstruction = _a.sent();
                         instructions.push(depositTokenStakeInstruction);
-                        return [3, 4];
-                    case 3:
+                        return [3, 5];
+                    case 4:
                         err_21 = _a.sent();
                         console.log("perpClient depositStakingInstruction error:: ", err_21);
                         throw err_21;
-                    case 4: return [2, {
+                    case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -5306,10 +5404,14 @@ var PerpetualsClient = (function () {
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _a.trys.push([1, 4, , 5]);
                         tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
                         userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.tokenMint, owner, true);
-                        preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(this.provider.wallet.publicKey, userTokenAccount, owner, poolConfig.tokenMint, spl_token_1.TOKEN_PROGRAM_ID));
+                        return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                    case 2:
+                        if (!(_a.sent())) {
+                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(this.provider.wallet.publicKey, userTokenAccount, owner, poolConfig.tokenMint));
+                        }
                         return [4, this.program.methods
                                 .unstakeTokenInstant({
                                 unstakeAmount: unstakeAmount
@@ -5328,15 +5430,15 @@ var PerpetualsClient = (function () {
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
-                    case 2:
+                    case 3:
                         unstakeTokenInstantInstruction = _a.sent();
                         instructions.push(unstakeTokenInstantInstruction);
-                        return [3, 4];
-                    case 3:
+                        return [3, 5];
+                    case 4:
                         err_23 = _a.sent();
                         console.log("perpClient unstakeTokenInstantInstruction error:: ", err_23);
                         throw err_23;
-                    case 4: return [2, {
+                    case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -5354,10 +5456,14 @@ var PerpetualsClient = (function () {
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _a.trys.push([1, 4, , 5]);
                         tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
                         userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.tokenMint, owner, true);
-                        preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(this.provider.wallet.publicKey, userTokenAccount, owner, poolConfig.tokenMint, spl_token_1.TOKEN_PROGRAM_ID));
+                        return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                    case 2:
+                        if (!(_a.sent())) {
+                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(this.provider.wallet.publicKey, userTokenAccount, owner, poolConfig.tokenMint));
+                        }
                         return [4, this.program.methods
                                 .withdrawToken({
                                 withdrawRequestId: withdrawRequestId
@@ -5376,15 +5482,15 @@ var PerpetualsClient = (function () {
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
-                    case 2:
+                    case 3:
                         withdrawTokenInstruction = _a.sent();
                         instructions.push(withdrawTokenInstruction);
-                        return [3, 4];
-                    case 3:
+                        return [3, 5];
+                    case 4:
                         err_24 = _a.sent();
                         console.log("perpClient withdrawTokenInstruction error:: ", err_24);
                         throw err_24;
-                    case 4: return [2, {
+                    case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -5436,23 +5542,32 @@ var PerpetualsClient = (function () {
             for (var _i = 2; _i < arguments.length; _i++) {
                 args_1[_i - 2] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([owner_1, poolConfig_1], args_1, true), void 0, function (owner, poolConfig, createUserATA, userPublicKey) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, collectTokenRewardInstruction, err_26;
+            return __awaiter(_this, __spreadArray([owner_1, poolConfig_1], args_1, true), void 0, function (owner, poolConfig, createUserATA) {
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, _a, collectTokenRewardInstruction, err_26;
                 if (createUserATA === void 0) { createUserATA = true; }
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _b.trys.push([1, 5, , 6]);
                             tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
                             userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.tokenMint, owner, true);
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userTokenAccount, publicKey, poolConfig.tokenMint, spl_token_1.TOKEN_PROGRAM_ID));
+                            _a = createUserATA;
+                            if (!_a) return [3, 3];
+                            return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                        case 2:
+                            _a = !(_b.sent());
+                            _b.label = 3;
+                        case 3:
+                            if (_a) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userTokenAccount, publicKey, poolConfig.tokenMint));
+                            }
                             return [4, this.program.methods
                                     .collectTokenReward({})
                                     .accounts({
@@ -5469,15 +5584,15 @@ var PerpetualsClient = (function () {
                                     tokenMint: poolConfig.tokenMint,
                                 })
                                     .instruction()];
-                        case 2:
-                            collectTokenRewardInstruction = _a.sent();
+                        case 4:
+                            collectTokenRewardInstruction = _b.sent();
                             instructions.push(collectTokenRewardInstruction);
-                            return [3, 4];
-                        case 3:
-                            err_26 = _a.sent();
+                            return [3, 6];
+                        case 5:
+                            err_26 = _b.sent();
                             console.log("perpClient collectTokenRewardInstruction error:: ", err_26);
                             throw err_26;
-                        case 4: return [2, {
+                        case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5491,23 +5606,32 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, rewardSymbol_1, poolConfig_1], args_1, true), void 0, function (owner, rewardSymbol, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, collectRevenueInstruction, err_27;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_27;
                 if (createUserATA === void 0) { createUserATA = true; }
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _b.trys.push([1, 5, , 6]);
                             rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
                             tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
                             userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, owner, true);
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userTokenAccount, publicKey, rewardCustodyMint, spl_token_1.TOKEN_PROGRAM_ID));
+                            _a = createUserATA;
+                            if (!_a) return [3, 3];
+                            return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                        case 2:
+                            _a = !(_b.sent());
+                            _b.label = 3;
+                        case 3:
+                            if (_a) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userTokenAccount, publicKey, rewardCustodyMint));
+                            }
                             return [4, this.program.methods
                                     .collectRevenue({})
                                     .accounts({
@@ -5524,15 +5648,15 @@ var PerpetualsClient = (function () {
                                     receivingTokenMint: rewardCustodyMint,
                                 })
                                     .instruction()];
-                        case 2:
-                            collectRevenueInstruction = _a.sent();
+                        case 4:
+                            collectRevenueInstruction = _b.sent();
                             instructions.push(collectRevenueInstruction);
-                            return [3, 4];
-                        case 3:
-                            err_27 = _a.sent();
+                            return [3, 6];
+                        case 5:
+                            err_27 = _b.sent();
                             console.log("perpClient collectRevenueInstruction error:: ", err_27);
                             throw err_27;
-                        case 4: return [2, {
+                        case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5546,23 +5670,32 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, rebateSymbol_1, poolConfig_1], args_1, true), void 0, function (owner, rebateSymbol, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateMint, tokenStakeAccount, userTokenAccount, collectRebateInstruction, err_28;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateMint, tokenStakeAccount, userTokenAccount, _a, collectRebateInstruction, err_28;
                 if (createUserATA === void 0) { createUserATA = true; }
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _b.trys.push([1, 5, , 6]);
                             rebateMint = poolConfig.getTokenFromSymbol(rebateSymbol).mintKey;
                             tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
                             userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rebateMint, owner, true);
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userTokenAccount, publicKey, rebateMint, spl_token_1.TOKEN_PROGRAM_ID));
+                            _a = createUserATA;
+                            if (!_a) return [3, 3];
+                            return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                        case 2:
+                            _a = !(_b.sent());
+                            _b.label = 3;
+                        case 3:
+                            if (_a) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userTokenAccount, publicKey, rebateMint));
+                            }
                             return [4, this.program.methods
                                     .collectRebate()
                                     .accounts({
@@ -5579,15 +5712,15 @@ var PerpetualsClient = (function () {
                                     receivingTokenMint: rebateMint,
                                 })
                                     .instruction()];
-                        case 2:
-                            collectRebateInstruction = _a.sent();
+                        case 4:
+                            collectRebateInstruction = _b.sent();
                             instructions.push(collectRebateInstruction);
-                            return [3, 4];
-                        case 3:
-                            err_28 = _a.sent();
+                            return [3, 6];
+                        case 5:
+                            err_28 = _b.sent();
                             console.log("perpClient collectRebateInstruction error:: ", err_28);
                             throw err_28;
-                        case 4: return [2, {
+                        case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5647,14 +5780,14 @@ var PerpetualsClient = (function () {
             for (var _i = 11; _i < arguments.length; _i++) {
                 args_1[_i - 11] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, limitPrice_1, reserveAmount_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, limitPrice, reserveAmount, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, limitPrice_1, reserveAmount_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, limitPrice, reserveAmount, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
                 var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_30;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
                             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); });
@@ -5770,14 +5903,14 @@ var PerpetualsClient = (function () {
             for (var _i = 11; _i < arguments.length; _i++) {
                 args_1[_i - 11] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, orderId_1, limitPrice_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey, userPublicKey) {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, positionAccount, orderAccount, editLimitOrder, err_31;
+            return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, orderId_1, limitPrice_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey) {
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_31;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
                             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); });
@@ -5787,33 +5920,43 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
-                            if (reserveSymbol == 'SOL') {
-                                lamports = (this.minimumBalanceForRentExemptAccountLamports);
-                                if (!ephemeralSignerPubkey) {
-                                    wrappedSolAccount = new web3_js_1.Keypair();
-                                    additionalSigners.push(wrappedSolAccount);
-                                }
-                                preInstructions = [
-                                    web3_js_1.SystemProgram.createAccount({
-                                        fromPubkey: publicKey,
-                                        newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                        lamports: lamports,
-                                        space: 165,
-                                        programId: spl_token_1.TOKEN_PROGRAM_ID,
-                                    }),
-                                    (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
-                                ];
-                                postInstructions = [
-                                    (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
-                                ];
+                            _b.trys.push([1, 7, , 8]);
+                            if (!(reserveSymbol == 'SOL')) return [3, 2];
+                            lamports = (this.minimumBalanceForRentExemptAccountLamports);
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
+                                additionalSigners.push(wrappedSolAccount);
                             }
-                            else {
-                                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);
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(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 = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports,
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
+                            ];
+                            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);
+                            _a = createUserATA;
+                            if (!_a) return [3, 4];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
+                            _a = !(_b.sent());
+                            _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));
                             }
+                            _b.label = 5;
+                        case 5:
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             orderAccount = poolConfig.getOrderFromMarketPk(publicKey, marketAccount);
                             return [4, this.program.methods
@@ -5847,15 +5990,15 @@ var PerpetualsClient = (function () {
                                     receivingMint: poolConfig.getTokenFromSymbol(reserveSymbol).mintKey
                                 })
                                     .instruction()];
-                        case 2:
-                            editLimitOrder = _a.sent();
+                        case 6:
+                            editLimitOrder = _b.sent();
                             instructions.push(editLimitOrder);
-                            return [3, 4];
-                        case 3:
-                            err_31 = _a.sent();
+                            return [3, 8];
+                        case 7:
+                            err_31 = _b.sent();
                             console.log("perpClient editLimitOrder error:: ", err_31);
                             throw err_31;
-                        case 4: return [2, {
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -6004,12 +6147,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.placeTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig, userPublicKey) { return __awaiter(_this, void 0, void 0, function () {
+        this.placeTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_34;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                        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); });
                         receivingCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receiveSymbol).mintKey); });
@@ -6063,12 +6206,12 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.editTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig, userPublicKey) { return __awaiter(_this, void 0, void 0, function () {
+        this.editTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_35;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                        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); });
                         receivingCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receiveSymbol).mintKey); });
@@ -6121,12 +6264,12 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.cancelTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, isStopLoss, poolConfig, userPublicKey) { return __awaiter(_this, void 0, void 0, function () {
+        this.cancelTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_36;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                        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); });
                         marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
@@ -6165,12 +6308,12 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.cancelAllTriggerOrders = function (targetSymbol, collateralSymbol, side, poolConfig, userPublicKey) { return __awaiter(_this, void 0, void 0, function () {
+        this.cancelAllTriggerOrders = function (targetSymbol, collateralSymbol, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_37;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                        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); });
                         marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
@@ -6213,13 +6356,13 @@ var PerpetualsClient = (function () {
                 args_1[_i - 9] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, targetSymbol_1, collateralSymbol_1, receivingSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1], args_1, true), void 0, function (owner, targetSymbol, collateralSymbol, receivingSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, collateralToken, receivingToken, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _a, _b, custody, executeTriggerWithSwap, err_38;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, collateralToken, receivingToken, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _c, _d, custody, executeTriggerWithSwap, err_38;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             payerPubkey = this.provider.wallet.publicKey;
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
@@ -6232,23 +6375,42 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             collateralToken = poolConfig.getTokenFromSymbol(collateralSymbol);
                             receivingToken = poolConfig.getTokenFromSymbol(receivingSymbol);
-                            _c.label = 1;
+                            _e.label = 1;
                         case 1:
-                            _c.trys.push([1, 3, , 4]);
-                            if (false) {
+                            _e.trys.push([1, 9, , 10]);
+                            if (!false) return [3, 2];
+                            return [3, 7];
+                        case 2:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(receivingSymbol).mintKey, owner, true, receivingToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            _a = createUserATA;
+                            if (!_a) return [3, 4];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
+                            _a = !(_e.sent());
+                            _e.label = 4;
+                        case 4:
+                            if (_a) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, owner, poolConfig.getTokenFromSymbol(receivingSymbol).mintKey));
                             }
-                            else {
-                                userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(receivingSymbol).mintKey, owner, true, receivingToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(payerPubkey, userReceivingTokenAccount, owner, poolConfig.getTokenFromSymbol(receivingSymbol).mintKey, spl_token_1.TOKEN_PROGRAM_ID));
-                                userReceivingTokenAccountCollateral = (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);
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(payerPubkey, userReceivingTokenAccountCollateral, owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).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, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
+                            _b = createUserATA;
+                            if (!_b) return [3, 6];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccountCollateral, this.provider.connection)];
+                        case 5:
+                            _b = !(_e.sent());
+                            _e.label = 6;
+                        case 6:
+                            if (_b) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccountCollateral, owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
+                            _e.label = 7;
+                        case 7:
                             positionAccount = poolConfig.getPositionFromMarketPk(owner, marketAccount);
                             orderAccount = poolConfig.getOrderFromMarketPk(owner, marketAccount);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
-                            for (_a = 0, _b = poolConfig.custodies; _a < _b.length; _a++) {
-                                custody = _b[_a];
+                            for (_c = 0, _d = poolConfig.custodies; _c < _d.length; _c++) {
+                                custody = _d[_c];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -6295,15 +6457,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
-                        case 2:
-                            executeTriggerWithSwap = _c.sent();
+                        case 8:
+                            executeTriggerWithSwap = _e.sent();
                             instructions.push(executeTriggerWithSwap);
-                            return [3, 4];
-                        case 3:
-                            err_38 = _c.sent();
+                            return [3, 10];
+                        case 9:
+                            err_38 = _e.sent();
                             console.log("perpClient executeTriggerWithSwap error:: ", err_38);
                             throw err_38;
-                        case 4: return [2, {
+                        case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -6317,13 +6479,13 @@ var PerpetualsClient = (function () {
                 args_1[_i - 8] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1], args_1, true), void 0, function (owner, targetSymbol, collateralSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeTriggerOrder, err_39;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_39;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             payerPubkey = this.provider.wallet.publicKey;
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
@@ -6333,15 +6495,25 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
-                            if (false) {
-                            }
-                            else {
-                                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);
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(payerPubkey, userReceivingTokenAccount, owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            _b.trys.push([1, 7, , 8]);
+                            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);
+                            _a = createUserATA;
+                            if (!_a) return [3, 4];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
+                            _a = !(_b.sent());
+                            _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));
                             }
+                            _b.label = 5;
+                        case 5:
                             positionAccount = poolConfig.getPositionFromMarketPk(owner, marketAccount);
                             orderAccount = poolConfig.getOrderFromMarketPk(owner, marketAccount);
                             return [4, this.program.methods
@@ -6373,15 +6545,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getReferralAccounts_1.getReferralAccounts)(tokenStakeAccount, userReferralAccount, privilege), true))
                                     .instruction()];
-                        case 2:
-                            executeTriggerOrder = _a.sent();
+                        case 6:
+                            executeTriggerOrder = _b.sent();
                             instructions.push(executeTriggerOrder);
-                            return [3, 4];
-                        case 3:
-                            err_39 = _a.sent();
+                            return [3, 8];
+                        case 7:
+                            err_39 = _b.sent();
                             console.log("perpClient executeTriggerOrder error:: ", err_39);
                             throw err_39;
-                        case 4: return [2, {
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -6394,16 +6566,16 @@ var PerpetualsClient = (function () {
             for (var _i = 5; _i < arguments.length; _i++) {
                 args_1[_i - 5] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1], args_1, true), void 0, function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks, ephemeralSignerPubkey, isWhitelistedUser, userPublicKey) {
-                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, custodyAccountMetas, custodyOracleAccountMetas, _d, _e, custody, whitelistPda, whitelistMeta, params, inx, closeWsolATAIns, err_40;
+            return __awaiter(_this, __spreadArray([userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1], args_1, true), void 0, function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks, ephemeralSignerPubkey, isWhitelistedUser) {
+                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _e, _f, custody, whitelistPda, whitelistMeta, params, inx, closeWsolATAIns, err_40;
                 if (useFeesPool === void 0) { useFeesPool = false; }
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (unWrapSol === void 0) { unWrapSol = false; }
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             userInputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey); });
                             if (!userInputCustodyConfig) {
@@ -6413,26 +6585,31 @@ var PerpetualsClient = (function () {
                             if (!userOutputCustodyConfig) {
                                 throw "userOutputCustodyConfig not found";
                             }
-                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            publicKey = this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            if (!(userInputTokenSymbol == 'SOL' && userOutputTokenSymbol == 'WSOL')) return [3, 4];
+                            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();
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT, spl_token_1.TOKEN_PROGRAM_ID));
-                            if (!!skipBalanceChecks) return [3, 3];
+                            wsolAssociatedTokenAccount = _g.sent();
+                            return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
+                        case 2:
+                            wsolATAExist = _g.sent();
+                            if (!wsolATAExist) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
+                            }
+                            if (!!skipBalanceChecks) return [3, 4];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 2:
-                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _f.sent()]))();
+                        case 3:
+                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _g.sent()]))();
                             if (unWrappedSolBalance.lt(amountIn)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            _f.label = 3;
-                        case 3:
+                            _g.label = 4;
+                        case 4:
                             instructions.push(web3_js_1.SystemProgram.transfer({
                                 fromPubkey: publicKey,
                                 toPubkey: wsolAssociatedTokenAccount,
@@ -6442,7 +6619,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);
@@ -6453,20 +6630,20 @@ var PerpetualsClient = (function () {
                                         additionalSigners: additionalSigners
                                     }];
                             }
-                            _f.label = 5;
-                        case 5:
-                            _f.trys.push([5, 16, , 17]);
-                            if (!(userInputTokenSymbol == 'SOL')) return [3, 8];
+                            _g.label = 6;
+                        case 6:
+                            _g.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:
-                            accCreationLamports = (_f.sent());
+                        case 7:
+                            accCreationLamports = (_g.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:
-                            unWrappedSolBalance = new (_b.apply(anchor_1.BN, [void 0, _f.sent()]))();
+                        case 8:
+                            unWrappedSolBalance = new (_b.apply(anchor_1.BN, [void 0, _g.sent()]))();
                             if (unWrappedSolBalance.lt(amountIn)) {
                                 throw "Insufficient SOL Funds";
                             }
@@ -6488,25 +6665,25 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 11];
-                        case 8:
+                            return [3, 12];
+                        case 9:
                             userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(userInputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID);
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
-                        case 9:
-                            if (!(_f.sent())) {
+                        case 10:
+                            if (!(_g.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:
-                            tokenAccountBalance = new (_c.apply(anchor_1.BN, [void 0, (_f.sent()).value.amount]))();
+                        case 11:
+                            tokenAccountBalance = new (_c.apply(anchor_1.BN, [void 0, (_g.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];
+                            _g.label = 12;
+                        case 12:
+                            if (!(userOutputTokenSymbol == 'SOL')) return [3, 13];
                             lamports = (this.minimumBalanceForRentExemptAccountLamports);
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
@@ -6526,17 +6703,26 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 14];
-                        case 12: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID)];
-                        case 13:
-                            userOutputTokenAccount = _f.sent();
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
-                            _f.label = 14;
+                            return [3, 17];
+                        case 13: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID)];
                         case 14:
+                            userOutputTokenAccount = _g.sent();
+                            _d = createUserATA;
+                            if (!_d) return [3, 16];
+                            return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
+                        case 15:
+                            _d = !(_g.sent());
+                            _g.label = 16;
+                        case 16:
+                            if (_d) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID));
+                            }
+                            _g.label = 17;
+                        case 17:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
-                            for (_d = 0, _e = poolConfig.custodies; _d < _e.length; _d++) {
-                                custody = _e[_d];
+                            for (_e = 0, _f = poolConfig.custodies; _e < _f.length; _e++) {
+                                custody = _f[_e];
                                 custodyAccountMetas.push({
                                     pubkey: custody.custodyAccount,
                                     isSigner: false,
@@ -6584,19 +6770,19 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
-                        case 15:
-                            inx = _f.sent();
+                        case 18:
+                            inx = _g.sent();
                             instructions.push(inx);
                             if (userOutputTokenSymbol == 'SOL' && unWrapSol) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userOutputTokenAccount, publicKey, publicKey);
                                 instructions.push(closeWsolATAIns);
                             }
-                            return [3, 17];
-                        case 16:
-                            err_40 = _f.sent();
+                            return [3, 20];
+                        case 19:
+                            err_40 = _g.sent();
                             console.error("perpClient Swap error:: ", err_40);
                             throw err_40;
-                        case 17: return [2, {
+                        case 20: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -6873,7 +7059,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCustody = function (poolName, tokenMint, isToken222, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment, rewardThreshold, minReserveUsd, limitPriceBufferBps) { return __awaiter(_this, void 0, void 0, function () {
+        this.addCustody = function (poolName, tokenMint, isToken222, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment, rewardThreshold, minReserveUsd, limitPriceBufferBps, inversePrice) { return __awaiter(_this, void 0, void 0, function () {
             var trx_id, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -6884,6 +7070,7 @@ var PerpetualsClient = (function () {
                                 isStable: isStable,
                                 depegAdjustment: depegAdjustment,
                                 isVirtual: isVirtual,
+                                inversePrice: inversePrice,
                                 token22: isToken222,
                                 oracle: oracle,
                                 pricing: pricing,
@@ -7674,11 +7861,15 @@ var PerpetualsClient = (function () {
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 4, , 5]);
+                        _a.trys.push([1, 5, , 6]);
                         return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.tokenMint, publicKey, true)];
                     case 2:
                         receivingTokenAccount = _a.sent();
-                        preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, receivingTokenAccount, publicKey, poolConfig.tokenMint, spl_token_1.TOKEN_PROGRAM_ID));
+                        return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
+                    case 3:
+                        if (!(_a.sent())) {
+                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, poolConfig.tokenMint));
+                        }
                         return [4, this.program.methods
                                 .withdrawInstantFees({})
                                 .accounts({
@@ -7693,15 +7884,15 @@ var PerpetualsClient = (function () {
                                 receivingTokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
-                    case 3:
+                    case 4:
                         withdrawInstantFeeInstruction = _a.sent();
                         instructions.push(withdrawInstantFeeInstruction);
-                        return [3, 5];
-                    case 4:
+                        return [3, 6];
+                    case 5:
                         err_58 = _a.sent();
                         console.log("perpClient withdrawInstantFeeInstruction error:: ", err_58);
                         throw err_58;
-                    case 5: return [2, {
+                    case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -7720,11 +7911,15 @@ var PerpetualsClient = (function () {
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 4, , 5]);
+                        _a.trys.push([1, 5, , 6]);
                         return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.tokenMint, publicKey, true)];
                     case 2:
                         receivingTokenAccount = _a.sent();
-                        preInstructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(publicKey, receivingTokenAccount, publicKey, poolConfig.tokenMint, spl_token_1.TOKEN_PROGRAM_ID));
+                        return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
+                    case 3:
+                        if (!(_a.sent())) {
+                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, poolConfig.tokenMint));
+                        }
                         return [4, this.program.methods
                                 .withdrawUnclaimedTokens({})
                                 .accounts({
@@ -7739,15 +7934,15 @@ var PerpetualsClient = (function () {
                                 receivingTokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
-                    case 3:
+                    case 4:
                         withdrawUnclaimedTokensInstruction = _a.sent();
                         instructions.push(withdrawUnclaimedTokensInstruction);
-                        return [3, 5];
-                    case 4:
+                        return [3, 6];
+                    case 5:
                         err_59 = _a.sent();
                         console.log("perpClient withdrawUnclaimedTokensInstruction error:: ", err_59);
                         throw err_59;
-                    case 5: return [2, {
+                    case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];