flash-sdk 2.15.3 → 2.16.0

package/dist/PerpetualsClient.js

@@ -89,7 +89,7 @@ var PerpetualsClient = (function () {
             _this.prioritizationFee = fee;
         };
         this.loadAddressLookupTable = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var addresses, _i, _a, address, addressLookupTable;
+            var addresses, _i, _a, address, addressLookupTable, accCreationLamports;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -111,6 +111,12 @@ var PerpetualsClient = (function () {
                         return [3, 1];
                     case 4:
                         this.addressLookupTables = addresses;
+                        return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
+                    case 5:
+                        accCreationLamports = (_b.sent());
+                        if (accCreationLamports) {
+                            this.minimumBalanceForRentExemptAccountLamports = accCreationLamports;
+                        }
                         return [2];
                 }
             });
@@ -2227,7 +2233,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userCollateralTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, params, instruction;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userCollateralTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, params, instruction;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -2244,18 +2250,17 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             if (!(collateralSymbol == 'SOL')) return [3, 4];
                             console.log("collateralSymbol === SOL", collateralSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 2:
-                            accCreationLamports = (_c.sent());
-                            console.log("accCreationLamports:", accCreationLamports);
-                            lamports = collateralWithfee.add(new anchor_1.BN(accCreationLamports));
+                            lamports = collateralWithfee.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
+                            if (!!skipBalanceChecks) return [3, 3];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 3:
+                        case 2:
                             unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
+                            _c.label = 3;
+                        case 3:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -2274,12 +2279,13 @@ var PerpetualsClient = (function () {
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
                             return [3, 7];
-                        case 4: return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 4:
+                            if (!!skipBalanceChecks) return [3, 7];
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
                         case 5:
                             if (!(_c.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            if (!!skipBalanceChecks) return [3, 7];
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userCollateralTokenAccount)];
                         case 6:
@@ -2338,7 +2344,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, swapOutCustodyConfig, swapInCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userOutputTokenAccount, marketAccount, positionAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, instruction;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, swapOutCustodyConfig, swapInCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userOutputTokenAccount, marketAccount, positionAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, instruction;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -2356,18 +2362,17 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             if (!(inputSymbol == 'SOL')) return [3, 3];
                             console.log("inputSymbol === SOL", inputSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 1:
-                            accCreationLamports = (_d.sent());
-                            console.log("accCreationLamports:", accCreationLamports);
-                            lamports = amountIn.add(new anchor_1.BN(accCreationLamports));
+                            lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
+                            if (!!skipBalanceChecks) return [3, 2];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 2:
+                        case 1:
                             unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _d.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
+                            _d.label = 2;
+                        case 2:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -2388,12 +2393,12 @@ var PerpetualsClient = (function () {
                             return [3, 6];
                         case 3:
                             userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(swapPoolConfig.getTokenFromSymbol(inputSymbol).mintKey, publicKey, true);
+                            if (!!skipBalanceChecks) return [3, 6];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 4:
                             if (!(_d.sent())) {
                                 throw "Insufficient Funds , Token Account doesn't exist";
                             }
-                            if (!!skipBalanceChecks) return [3, 6];
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
                         case 5:
@@ -2410,7 +2415,6 @@ var PerpetualsClient = (function () {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, swapPoolConfig.getTokenFromSymbol(swapOutCustodyConfig.symbol).mintKey));
                             }
                             marketAccount = positionPoolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
-                            console.log('marketAccount :>> ', marketAccount.toBase58(), targetCustodyConfig.custodyAccount.toBase58(), collateralCustodyConfig.custodyAccount.toBase58());
                             positionAccount = positionPoolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
@@ -2495,11 +2499,9 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 9, , 10]);
-                            if (!(collateralSymbol == 'SOL')) return [3, 3];
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 2:
-                            lamports = (_b.sent());
+                            _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);
@@ -2517,22 +2519,21 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 7];
-                        case 3: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true)];
-                        case 4:
-                            userReceivingTokenAccount = _b.sent();
+                            return [3, 5];
+                        case 2:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
                             _a = createUserATA;
-                            if (!_a) return [3, 6];
+                            if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 5:
+                        case 3:
                             _a = !(_b.sent());
-                            _b.label = 6;
-                        case 6:
+                            _b.label = 4;
+                        case 4:
                             if (_a) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
-                            _b.label = 7;
-                        case 7:
+                            _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);
@@ -2563,19 +2564,19 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
                                     .instruction()];
-                        case 8:
+                        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, 10];
-                        case 9:
+                            return [3, 8];
+                        case 7:
                             error_2 = _b.sent();
                             console.error("perpclient closePosition error:", error_2);
-                            return [3, 10];
-                        case 10: return [2, {
+                            return [3, 8];
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -2605,11 +2606,9 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            if (!(outputSymbol == 'SOL')) return [3, 2];
+                            if (!(outputSymbol == 'SOL')) return [3, 1];
                             console.log("outputSymbol === SOL", outputSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 1:
-                            lamports = (_b.sent());
+                            lamports = (this.minimumBalanceForRentExemptAccountLamports);
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -2628,20 +2627,20 @@ var PerpetualsClient = (function () {
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
                             additionalSigners.push(wrappedSolAccount);
-                            return [3, 5];
-                        case 2: return [4, (0, spl_token_1.getAssociatedTokenAddress)(swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true)];
-                        case 3:
+                            return [3, 4];
+                        case 1: return [4, (0, spl_token_1.getAssociatedTokenAddress)(swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true)];
+                        case 2:
                             userReceivingTokenAccount = _b.sent();
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 4:
+                        case 3:
                             if (!(_b.sent())) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, swapPoolConfig.getTokenFromSymbol(outputSymbol).mintKey));
                             }
-                            _b.label = 5;
-                        case 5:
+                            _b.label = 4;
+                        case 4:
                             userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
-                        case 6:
+                        case 5:
                             if (!(_b.sent())) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, positionPoolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
@@ -2696,7 +2695,7 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
-                        case 7:
+                        case 6:
                             instruction = _b.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -2731,7 +2730,7 @@ var PerpetualsClient = (function () {
                             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();
@@ -2741,6 +2740,7 @@ var PerpetualsClient = (function () {
                             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 3:
@@ -2748,6 +2748,8 @@ var PerpetualsClient = (function () {
                             if (unWrappedSolBalance.lt(amountIn)) {
                                 throw "Insufficient SOL Funds";
                             }
+                            _f.label = 4;
+                        case 4:
                             instructions.push(web3_js_1.SystemProgram.transfer({
                                 fromPubkey: publicKey,
                                 toPubkey: wsolAssociatedTokenAccount,
@@ -2757,20 +2759,20 @@ var PerpetualsClient = (function () {
                                     instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                     additionalSigners: additionalSigners
                                 }];
-                        case 4:
-                            if (!(userInputTokenSymbol == 'WSOL' && userOutputTokenSymbol == 'SOL')) return [3, 6];
-                            console.log("WSOL=> SOL : NOTE : ONLY WAY IS TO CLOSE THE WSOL ATA and GET ALL SOL ");
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, publicKey, true)];
                         case 5:
-                            wsolAssociatedTokenAccount = _f.sent();
-                            closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(wsolAssociatedTokenAccount, publicKey, publicKey);
-                            instructions.push(closeWsolATAIns);
-                            return [2, {
-                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                                    additionalSigners: additionalSigners
-                                }];
+                            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);
+                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(wsolAssociatedTokenAccount, publicKey, publicKey);
+                                instructions.push(closeWsolATAIns);
+                                return [2, {
+                                        instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                        additionalSigners: additionalSigners
+                                    }];
+                            }
+                            _f.label = 6;
                         case 6:
-                            _f.trys.push([6, 21, , 22]);
+                            _f.trys.push([6, 19, , 20]);
                             if (!(userInputTokenSymbol == 'SOL')) return [3, 9];
                             console.log("userInputTokenSymbol === sol", userInputTokenSymbol);
                             return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
@@ -2803,29 +2805,26 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 13];
-                        case 9: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey, publicKey, true)];
-                        case 10:
-                            userInputTokenAccount = _f.sent();
+                            return [3, 12];
+                        case 9:
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
-                        case 11:
+                        case 10:
                             if (!(_f.sent())) {
                                 throw "Insufficient Funds , Token Account doesn't exist";
                             }
-                            if (!!skipBalanceChecks) return [3, 13];
+                            if (!!skipBalanceChecks) return [3, 12];
                             _c = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
-                        case 12:
+                        case 11:
                             tokenAccountBalance = new (_c.apply(anchor_1.BN, [void 0, (_f.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(amountIn)) {
                                 throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            _f.label = 13;
-                        case 13:
-                            if (!(userOutputTokenSymbol == 'SOL')) return [3, 15];
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 14:
-                            lamports = (_f.sent());
+                            _f.label = 12;
+                        case 12:
+                            if (!(userOutputTokenSymbol == 'SOL')) return [3, 13];
+                            lamports = (this.minimumBalanceForRentExemptAccountLamports);
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -2844,22 +2843,22 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 19];
-                        case 15: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true)];
-                        case 16:
+                            return [3, 17];
+                        case 13: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true)];
+                        case 14:
                             userOutputTokenAccount = _f.sent();
                             _d = createUserATA;
-                            if (!_d) return [3, 18];
+                            if (!_d) return [3, 16];
                             return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
-                        case 17:
+                        case 15:
                             _d = !(_f.sent());
-                            _f.label = 18;
-                        case 18:
+                            _f.label = 16;
+                        case 16:
                             if (_d) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey));
                             }
-                            _f.label = 19;
-                        case 19:
+                            _f.label = 17;
+                        case 17:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             for (_i = 0, _e = poolConfig.custodies; _i < _e.length; _i++) {
@@ -2902,19 +2901,19 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
-                        case 20:
+                        case 18:
                             inx = _f.sent();
                             instructions.push(inx);
                             if (userOutputTokenSymbol == 'SOL' && unWrapSol) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userOutputTokenAccount, publicKey, publicKey);
                                 instructions.push(closeWsolATAIns);
                             }
-                            return [3, 22];
-                        case 21:
+                            return [3, 20];
+                        case 19:
                             err_2 = _f.sent();
                             console.error("perpClient Swap error:: ", err_2);
                             throw err_2;
-                        case 22: return [2, {
+                        case 20: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -2997,7 +2996,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, userPayingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, solBal, tokenAccountBalance, _b, instruction;
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, userPayingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, instruction;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -3013,25 +3012,20 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            if (!(collateralSymbol == 'SOL')) return [3, 4];
+                            if (!(collateralSymbol == 'SOL')) return [3, 3];
                             console.log("collateralSymbol === SOL", collateralSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 1:
-                            accCreationLamports = (_c.sent());
-                            console.log("accCreationLamports:", accCreationLamports);
-                            lamports = collateralWithFee.add(new anchor_1.BN(accCreationLamports));
+                            lamports = collateralWithFee.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
                             console.log("lamports:", lamports.toNumber());
+                            if (!!skipBalanceChecks) return [3, 2];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 2:
+                        case 1:
                             unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            return [4, this.provider.connection.getBalance(publicKey)];
-                        case 3:
-                            solBal = _c.sent();
-                            console.log("solBal>>:", solBal);
+                            _c.label = 2;
+                        case 2:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -3049,22 +3043,23 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 7];
-                        case 4: return [4, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
-                        case 5:
+                            return [3, 6];
+                        case 3:
+                            if (!!skipBalanceChecks) return [3, 6];
+                            return [4, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
+                        case 4:
                             if (!(_c.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            if (!!skipBalanceChecks) return [3, 7];
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userPayingTokenAccount)];
-                        case 6:
+                        case 5:
                             tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_c.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(collateralWithFee)) {
                                 throw "Insufficient Funds need more ".concat(collateralWithFee.sub(tokenAccountBalance), " tokens");
                             }
-                            _c.label = 7;
-                        case 7: return [4, this.program.methods.addCollateral({
+                            _c.label = 6;
+                        case 6: return [4, this.program.methods.addCollateral({
                                 collateralDelta: collateralWithFee
                             }).accounts({
                                 owner: publicKey,
@@ -3084,7 +3079,7 @@ var PerpetualsClient = (function () {
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                             })
                                 .instruction()];
-                        case 8:
+                        case 7:
                             instruction = _c.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -3099,7 +3094,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, collateralCustodyConfig, targetCustodyConfig, outputCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, marketAccount, instruction;
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, outputCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, marketAccount, instruction;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -3120,19 +3115,18 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             if (!(inputSymbol == 'SOL')) return [3, 3];
                             console.log("inputSymbol === SOL", inputSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 1:
-                            accCreationLamports = (_d.sent());
-                            console.log("accCreationLamports:", accCreationLamports);
-                            lamports = amountIn.add(new anchor_1.BN(accCreationLamports));
+                            lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
                             console.log("lamports:", lamports.toNumber());
+                            if (!!skipBalanceChecks) return [3, 2];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 2:
+                        case 1:
                             unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _d.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
+                            _d.label = 2;
+                        case 2:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -3153,12 +3147,12 @@ var PerpetualsClient = (function () {
                             return [3, 6];
                         case 3:
                             userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true);
+                            if (!!skipBalanceChecks) return [3, 6];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
                         case 4:
                             if (!(_d.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            if (!!skipBalanceChecks) return [3, 6];
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
                         case 5:
@@ -3257,14 +3251,12 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 9, , 10]);
+                            _b.trys.push([1, 7, , 8]);
                             console.log("removeCollateral  -- collateralSymbol:", collateralSymbol);
-                            if (!(collateralSymbol == 'SOL')) return [3, 3];
+                            if (!(collateralSymbol == 'SOL')) return [3, 2];
                             console.log("remove collateral in SOL ...create WSOL temp and close it ");
                             userReceivingTokenAccount = wrappedSolAccount.publicKey;
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 2:
-                            lamports = (_b.sent());
+                            lamports = this.minimumBalanceForRentExemptAccountLamports;
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -3282,22 +3274,21 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 7];
-                        case 3: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true)];
-                        case 4:
-                            userReceivingTokenAccount = _b.sent();
+                            return [3, 5];
+                        case 2:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
                             _a = createUserATA;
-                            if (!_a) return [3, 6];
+                            if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 5:
+                        case 3:
                             _a = !(_b.sent());
-                            _b.label = 6;
-                        case 6:
+                            _b.label = 4;
+                        case 4:
                             if (_a) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
-                            _b.label = 7;
-                        case 7:
+                            _b.label = 5;
+                        case 5:
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.program.methods
                                     .removeCollateral({
@@ -3322,19 +3313,19 @@ var PerpetualsClient = (function () {
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
                                     .instruction()];
-                        case 8:
+                        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, 10];
-                        case 9:
+                            return [3, 8];
+                        case 7:
                             error_3 = _b.sent();
                             console.error("perpclient removeCollateral error:", error_3);
-                            return [3, 10];
-                        case 10: return [2, {
+                            return [3, 8];
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -3361,11 +3352,9 @@ var PerpetualsClient = (function () {
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            if (!(outputSymbol == 'SOL')) return [3, 2];
+                            if (!(outputSymbol == 'SOL')) return [3, 1];
                             console.log("outputSymbol === SOL", outputSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 1:
-                            lamports = (_b.sent());
+                            lamports = this.minimumBalanceForRentExemptAccountLamports;
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -3383,20 +3372,19 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 5];
-                        case 2: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfigSwap.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true)];
-                        case 3:
-                            userReceivingTokenAccount = _b.sent();
+                            return [3, 3];
+                        case 1:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfigSwap.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 4:
+                        case 2:
                             if (!(_b.sent())) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfigSwap.getTokenFromSymbol(outputSymbol).mintKey));
                             }
-                            _b.label = 5;
-                        case 5:
+                            _b.label = 3;
+                        case 3:
                             userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfigPosition.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
                             return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
-                        case 6:
+                        case 4:
                             if (!(_b.sent())) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfigPosition.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
@@ -3450,7 +3438,7 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
-                        case 7:
+                        case 5:
                             instruction = _b.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -3585,7 +3573,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, accCreationLamports, lamports, unWrappedSolBalance, _d, tokenAccountBalance, _e, instruction, err_4;
+                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, tokenAccountBalance, _e, instruction, err_4;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -3600,13 +3588,9 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _f.label = 1;
                         case 1:
-                            _f.trys.push([1, 12, , 13]);
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(payTokenCustodyConfig.mintKey, publicKey, true)];
-                        case 2:
-                            userPayingTokenAccount = _f.sent();
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.stakedLpTokenMint, publicKey, true)];
-                        case 3:
-                            lpTokenAccount = _f.sent();
+                            _f.trys.push([1, 10, , 11]);
+                            userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(payTokenCustodyConfig.mintKey, publicKey, true);
+                            lpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.stakedLpTokenMint, publicKey, true);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
@@ -3632,24 +3616,23 @@ var PerpetualsClient = (function () {
                                 });
                             }
                             return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
-                        case 4:
+                        case 2:
                             if (!(_f.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
                             }
-                            if (!(payTokenSymbol == 'SOL')) return [3, 7];
+                            if (!(payTokenSymbol == 'SOL')) return [3, 5];
                             console.log("payTokenSymbol === SOL", payTokenSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 5:
-                            accCreationLamports = (_f.sent());
-                            console.log("accCreationLamports:", accCreationLamports);
-                            lamports = tokenAmountIn.add(new anchor_1.BN(accCreationLamports));
+                            lamports = tokenAmountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
+                            if (!!skipBalanceChecks) return [3, 4];
                             _d = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 6:
+                        case 3:
                             unWrappedSolBalance = new (_d.apply(anchor_1.BN, [void 0, _f.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
+                            _f.label = 4;
+                        case 4:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -3667,22 +3650,23 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 10];
-                        case 7: return [4, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
-                        case 8:
+                            return [3, 8];
+                        case 5:
+                            if (!!skipBalanceChecks) return [3, 8];
+                            return [4, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
+                        case 6:
                             if (!(_f.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            if (!!skipBalanceChecks) return [3, 10];
                             _e = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userPayingTokenAccount)];
-                        case 9:
+                        case 7:
                             tokenAccountBalance = new (_e.apply(anchor_1.BN, [void 0, (_f.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(tokenAmountIn)) {
                                 throw "Insufficient Funds need more ".concat(tokenAmountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            _f.label = 10;
-                        case 10: return [4, this.program.methods
+                            _f.label = 8;
+                        case 8: return [4, this.program.methods
                                 .addLiquidity({
                                 amountIn: tokenAmountIn,
                                 minLpAmountOut: minLpAmountOut
@@ -3705,15 +3689,15 @@ var PerpetualsClient = (function () {
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                 .instruction()];
-                        case 11:
+                        case 9:
                             instruction = _f.sent();
                             instructions.push(instruction);
-                            return [3, 13];
-                        case 12:
+                            return [3, 11];
+                        case 10:
                             err_4 = _f.sent();
                             console.error("perpClient addLiquidity error:: ", err_4);
                             throw err_4;
-                        case 13: return [2, {
+                        case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -3725,7 +3709,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, flpStakeAccount, poolStakedLpVault, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _c, custody, _d, _e, market, instruction;
+                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, flpStakeAccount, poolStakedLpVault, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _c, custody, _d, _e, market, instruction;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -3736,28 +3720,24 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             lpTokenMint = poolConfig.stakedLpTokenMint;
                             inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(lpTokenMint, publicKey, true)];
-                        case 1:
-                            lpTokenAccount = _f.sent();
+                            lpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(lpTokenMint, publicKey, true);
                             flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
                             poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
-                            if (!(inputSymbol == 'SOL')) return [3, 5];
+                            if (!(inputSymbol == 'SOL')) return [3, 4];
                             console.log("inputSymbol === SOL", inputSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 2:
-                            accCreationLamports = (_f.sent());
-                            console.log("accCreationLamports:", accCreationLamports);
-                            lamports = amountIn.add(new anchor_1.BN(accCreationLamports));
+                            lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
                             console.log("lamports:", lamports.toNumber());
+                            if (!!skipBalanceChecks) return [3, 2];
                             _a = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 3:
+                        case 1:
                             unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _f.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
-                            return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
-                        case 4:
+                            _f.label = 2;
+                        case 2: return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
+                        case 3:
                             if (!(_f.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
                             }
@@ -3778,24 +3758,24 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 8];
-                        case 5:
+                            return [3, 7];
+                        case 4:
                             userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true);
+                            if (!!skipBalanceChecks) return [3, 7];
                             return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
-                        case 6:
+                        case 5:
                             if (!(_f.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            if (!!skipBalanceChecks) return [3, 8];
                             _b = anchor_1.BN.bind;
                             return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
-                        case 7:
+                        case 6:
                             tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_f.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(amountIn)) {
                                 throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            _f.label = 8;
-                        case 8:
+                            _f.label = 7;
+                        case 7:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
@@ -3844,7 +3824,7 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
-                        case 9:
+                        case 8:
                             instruction = _f.sent();
                             instructions.push(instruction);
                             return [2, {
@@ -3876,10 +3856,8 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _e.label = 1;
                         case 1:
-                            _e.trys.push([1, 10, , 11]);
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.stakedLpTokenMint, publicKey, true)];
-                        case 2:
-                            stakedLpTokenAccount = _e.sent();
+                            _e.trys.push([1, 7, , 8]);
+                            stakedLpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.stakedLpTokenMint, publicKey, true);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
@@ -3904,10 +3882,8 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            if (!(recieveTokenSymbol == 'SOL')) return [3, 4];
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 3:
-                            lamports = (_e.sent());
+                            if (!(recieveTokenSymbol == 'SOL')) return [3, 2];
+                            lamports = this.minimumBalanceForRentExemptAccountLamports;
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -3925,47 +3901,44 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 8];
-                        case 4: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey, publicKey, true)];
-                        case 5:
-                            userReceivingTokenAccount = _e.sent();
+                            return [3, 5];
+                        case 2:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey, publicKey, true);
                             _d = createUserATA;
-                            if (!_d) return [3, 7];
+                            if (!_d) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 6:
+                        case 3:
                             _d = !(_e.sent());
-                            _e.label = 7;
-                        case 7:
+                            _e.label = 4;
+                        case 4:
                             if (_d) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(recieveTokenSymbol).mintKey));
                             }
-                            _e.label = 8;
-                        case 8:
-                            console.log("liquidityAmountIn", liquidityAmountIn.toString());
-                            return [4, this.program.methods
-                                    .removeLiquidity({
-                                    lpAmountIn: liquidityAmountIn,
-                                    minAmountOut: minTokenAmountOut
-                                })
-                                    .accounts({
-                                    owner: publicKey,
-                                    receivingAccount: recieveTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
-                                    lpTokenAccount: stakedLpTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
-                                    custody: recieveTokenCustodyConfig.custodyAccount,
-                                    custodyOracleAccount: this.useExtOracleAccount ? recieveTokenCustodyConfig.extOracleAccount : recieveTokenCustodyConfig.intOracleAccount,
-                                    custodyTokenAccount: recieveTokenCustodyConfig.tokenAccount,
-                                    lpTokenMint: poolConfig.stakedLpTokenMint,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                                })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
-                                    .instruction()];
-                        case 9:
+                            _e.label = 5;
+                        case 5: return [4, this.program.methods
+                                .removeLiquidity({
+                                lpAmountIn: liquidityAmountIn,
+                                minAmountOut: minTokenAmountOut
+                            })
+                                .accounts({
+                                owner: publicKey,
+                                receivingAccount: recieveTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
+                                lpTokenAccount: stakedLpTokenAccount,
+                                transferAuthority: poolConfig.transferAuthority,
+                                perpetuals: poolConfig.perpetuals,
+                                pool: poolConfig.poolAddress,
+                                custody: recieveTokenCustodyConfig.custodyAccount,
+                                custodyOracleAccount: this.useExtOracleAccount ? recieveTokenCustodyConfig.extOracleAccount : recieveTokenCustodyConfig.intOracleAccount,
+                                custodyTokenAccount: recieveTokenCustodyConfig.tokenAccount,
+                                lpTokenMint: poolConfig.stakedLpTokenMint,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                program: this.programId,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                            })
+                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
+                                .instruction()];
+                        case 6:
                             removeLiquidityTx = _e.sent();
                             instructions.push(removeLiquidityTx);
                             if (closeLpATA) {
@@ -3976,12 +3949,12 @@ var PerpetualsClient = (function () {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
                                 postInstructions.push(closeWsolATAIns);
                             }
-                            return [3, 11];
-                        case 10:
+                            return [3, 8];
+                        case 7:
                             err_5 = _e.sent();
                             console.log("perpClient removeLiquidity error:: ", err_5);
                             throw err_5;
-                        case 11: return [2, {
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -4039,15 +4012,13 @@ var PerpetualsClient = (function () {
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 4, , 5]);
+                        _a.trys.push([1, 3, , 4]);
                         nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
                             Buffer.from("trading"),
                             nftMint.toBuffer(),
                         ], this.programId)[0];
                         metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(nftMint, owner, true)];
-                    case 2:
-                        nftTokenAccount = _a.sent();
+                        nftTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(nftMint, owner, true);
                         return [4, this.program.methods
                                 .createTradingAccount({
                                 collectionIndex: 0
@@ -4063,15 +4034,15 @@ var PerpetualsClient = (function () {
                                 systemProgram: web3_js_1.SystemProgram.programId
                             })
                                 .instruction()];
-                    case 3:
+                    case 2:
                         createNftTradingAccountInstruction = _a.sent();
                         instructions.push(createNftTradingAccountInstruction);
-                        return [3, 5];
-                    case 4:
+                        return [3, 4];
+                    case 3:
                         err_7 = _a.sent();
                         console.log("perpClient createNftAccount error:: ", err_7);
                         throw err_7;
-                    case 5: return [2, {
+                    case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -4436,7 +4407,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.unstakeInstant = function (rewardSymbol, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, flpStakeAccount, unstakeInstantInstruction, err_14;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, unstakeInstantInstruction, err_14;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4448,10 +4419,8 @@ var PerpetualsClient = (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
                         rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
                         pool = poolConfig.poolAddress;
-                        feeDistributionTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("custody_token_account"), pool.toBuffer(), rewardCustodyMint.toBuffer()], this.programId)[0];
                         flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), pool.toBuffer()], this.programId)[0];
                         return [4, this.program.methods
                                 .unstakeInstant({
@@ -4595,21 +4564,19 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 6, , 7]);
+                            _b.trys.push([1, 5, , 6]);
                             lpTokenMint = poolConfig.stakedLpTokenMint;
                             pool = poolConfig.poolAddress;
                             poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), pool.toBuffer(), lpTokenMint.toBuffer()], this.program.programId)[0];
                             flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), pool.toBuffer()], this.program.programId)[0];
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.stakedLpTokenMint, publicKey, true)];
-                        case 2:
-                            userLpTokenAccount = _b.sent();
+                            userLpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.stakedLpTokenMint, publicKey, true);
                             _a = createUserLPTA;
-                            if (!_a) return [3, 4];
+                            if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(userLpTokenAccount, this.provider.connection)];
-                        case 3:
+                        case 2:
                             _a = !(_b.sent());
-                            _b.label = 4;
-                        case 4:
+                            _b.label = 3;
+                        case 3:
                             if (_a) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userLpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
                             }
@@ -4632,15 +4599,15 @@ var PerpetualsClient = (function () {
                                     program: this.program.programId,
                                 })
                                     .instruction()];
-                        case 5:
+                        case 4:
                             withdrawStakeInstruction = _b.sent();
                             instructions.push(withdrawStakeInstruction);
-                            return [3, 7];
-                        case 6:
+                            return [3, 6];
+                        case 5:
                             err_17 = _b.sent();
                             console.log("perpClient withdrawStake error:: ", err_17);
                             throw err_17;
-                        case 7: return [2, {
+                        case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -4788,10 +4755,8 @@ var PerpetualsClient = (function () {
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 4, , 5]);
-                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(rewardCustodyMint, publicKey, true)];
-                    case 2:
-                        fundingAccount = _a.sent();
+                        _a.trys.push([1, 3, , 4]);
+                        fundingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                         rewardVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_vault")], this.programFbnftReward.programId)[0];
                         rewardTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_token_account")], this.programFbnftReward.programId)[0];
                         return [4, this.programFbnftReward.methods
@@ -4806,15 +4771,15 @@ var PerpetualsClient = (function () {
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                             })
                                 .instruction()];
-                    case 3:
+                    case 2:
                         distributeReward = _a.sent();
                         instructions.push(distributeReward);
-                        return [3, 5];
-                    case 4:
+                        return [3, 4];
+                    case 3:
                         err_20 = _a.sent();
                         console.log("perpClient distributeReward error:: ", err_20);
                         throw err_20;
-                    case 5: return [2, {
+                    case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -4834,21 +4799,17 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 7, , 8]);
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(nftMint, publicKey, true)];
-                        case 2:
-                            nftTokenAccount = _b.sent();
+                            _b.trys.push([1, 5, , 6]);
+                            nftTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(nftMint, publicKey, true);
                             metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(rewardCustodyMint, publicKey, true)];
-                        case 3:
-                            receivingTokenAccount = _b.sent();
+                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                             _a = createUserATA;
-                            if (!_a) return [3, 5];
+                            if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
-                        case 4:
+                        case 2:
                             _a = !(_b.sent());
-                            _b.label = 5;
-                        case 5:
+                            _b.label = 3;
+                        case 3:
                             if (_a) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint));
                             }
@@ -4873,14 +4834,14 @@ var PerpetualsClient = (function () {
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 })
                                     .instruction()];
-                        case 6:
+                        case 4:
                             collectNftReward = _b.sent();
                             instructions.push(collectNftReward);
-                            return [3, 8];
-                        case 7:
+                            return [3, 6];
+                        case 5:
                             err_21 = _b.sent();
                             throw err_21;
-                        case 8: return [2, {
+                        case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5035,12 +4996,10 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 9, , 10]);
-                            if (!(collateralSymbol == 'SOL')) return [3, 3];
+                            _b.trys.push([1, 7, , 8]);
+                            if (!(collateralSymbol == 'SOL')) return [3, 2];
                             console.log("collateralSymbol === SOL", collateralSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 2:
-                            lamports = (_b.sent());
+                            lamports = this.minimumBalanceForRentExemptAccountLamports;
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -5058,22 +5017,21 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), positionAccount.owner, positionAccount.owner),
                             ];
-                            return [3, 7];
-                        case 3: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, positionAccount.owner, true)];
-                        case 4:
-                            userReceivingTokenAccount = _b.sent();
+                            return [3, 5];
+                        case 2:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, positionAccount.owner, true);
                             _a = createUserATA;
-                            if (!_a) return [3, 6];
+                            if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 5:
+                        case 3:
                             _a = !(_b.sent());
-                            _b.label = 6;
-                        case 6:
+                            _b.label = 4;
+                        case 4:
                             if (_a) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, positionAccount.owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
-                            _b.label = 7;
-                        case 7: return [4, this.program.methods
+                            _b.label = 5;
+                        case 5: return [4, this.program.methods
                                 .forceClosePosition({
                                 privilege: types_1.Privilege.None,
                                 isStopLoss: isStopLoss
@@ -5097,19 +5055,19 @@ var PerpetualsClient = (function () {
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .instruction()];
-                        case 8:
+                        case 6:
                             forceClosePosition = _b.sent();
                             instructions.push(forceClosePosition);
                             if (collateralSymbol == 'WSOL' && closeUsersWSOLATA) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, positionAccount.owner, positionAccount.owner);
                                 postInstructions.push(closeWsolATAIns);
                             }
-                            return [3, 10];
-                        case 9:
+                            return [3, 8];
+                        case 7:
                             err_24 = _b.sent();
                             console.log("perpClient forceClosePosition error:: ", err_24);
                             throw err_24;
-                        case 10: return [2, {
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5269,7 +5227,6 @@ var PerpetualsClient = (function () {
                         instructions = [];
                         additionalSigners = [];
                         custodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(tokenMint); });
-                        console.log("custodyConfig: ", custodyConfig);
                         _g.label = 1;
                     case 1:
                         _g.trys.push([1, 4, , 5]);
@@ -5352,10 +5309,11 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCompoundingLiquidity = function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig, ephemeralSignerPubkey) {
+        this.addCompoundingLiquidity = function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, accCreationLamports, lamports, unWrappedSolBalance, _d, addCompoundingLiquidity, err_30;
+                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, addCompoundingLiquidity, err_30;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -5368,15 +5326,9 @@ var PerpetualsClient = (function () {
                             inCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inTokenSymbol).mintKey); });
                             lpTokenMint = poolConfig.stakedLpTokenMint;
                             compoundingTokenMint = poolConfig.compoundingTokenMint;
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.stakedLpTokenMint, publicKey, true)];
-                        case 1:
-                            lpTokenAccount = _e.sent();
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(compoundingTokenMint, publicKey, true)];
-                        case 2:
-                            compoundingTokenAccount = _e.sent();
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(inCustodyConfig.mintKey, publicKey, true)];
-                        case 3:
-                            fundingAccount = _e.sent();
+                            lpTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.stakedLpTokenMint, publicKey, true);
+                            compoundingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(compoundingTokenMint, publicKey, true);
+                            fundingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inCustodyConfig.mintKey, publicKey, true);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
@@ -5402,29 +5354,28 @@ var PerpetualsClient = (function () {
                                 });
                             }
                             return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
-                        case 4:
+                        case 1:
                             if (!(_e.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
                             }
                             return [4, (0, utils_1.checkIfAccountExists)(compoundingTokenAccount, this.provider.connection)];
-                        case 5:
+                        case 2:
                             if (!(_e.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, compoundingTokenAccount, publicKey, poolConfig.compoundingTokenMint));
                             }
-                            if (!(inTokenSymbol == 'SOL')) return [3, 8];
+                            if (!(inTokenSymbol == 'SOL')) return [3, 5];
                             console.log("inTokenSymbol === SOL", inTokenSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 6:
-                            accCreationLamports = (_e.sent());
-                            console.log("accCreationLamports:", accCreationLamports);
-                            lamports = amountIn.add(new anchor_1.BN(accCreationLamports));
+                            lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
+                            if (!!skipBalanceChecks) return [3, 4];
                             _d = anchor_1.BN.bind;
                             return [4, this.provider.connection.getBalance(publicKey)];
-                        case 7:
+                        case 3:
                             unWrappedSolBalance = new (_d.apply(anchor_1.BN, [void 0, _e.sent()]))();
                             if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
+                            _e.label = 4;
+                        case 4:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -5442,15 +5393,17 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 10];
-                        case 8: return [4, (0, utils_1.checkIfAccountExists)(fundingAccount, this.provider.connection)];
-                        case 9:
+                            return [3, 7];
+                        case 5:
+                            if (!!skipBalanceChecks) return [3, 7];
+                            return [4, (0, utils_1.checkIfAccountExists)(fundingAccount, this.provider.connection)];
+                        case 6:
                             if (!(_e.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            _e.label = 10;
-                        case 10:
-                            _e.trys.push([10, 12, , 13]);
+                            _e.label = 7;
+                        case 7:
+                            _e.trys.push([7, 9, , 10]);
                             return [4, this.program.methods
                                     .addCompoundingLiquidity({
                                     amountIn: amountIn,
@@ -5478,15 +5431,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
-                        case 11:
+                        case 8:
                             addCompoundingLiquidity = _e.sent();
                             instructions.push(addCompoundingLiquidity);
-                            return [3, 13];
-                        case 12:
+                            return [3, 10];
+                        case 9:
                             err_30 = _e.sent();
                             console.log("perpClient addCompoundingLiquidity error:: ", err_30);
-                            return [3, 13];
-                        case 13: return [2, {
+                            return [3, 10];
+                        case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5498,7 +5451,7 @@ var PerpetualsClient = (function () {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, compoundingTokenAccount, receivingAccount, removeCompoundingLiquidity, err_31;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, compoundingTokenAccount, removeCompoundingLiquidity, err_31;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -5511,10 +5464,8 @@ 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')) return [3, 2];
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 1:
-                            lamports = (_e.sent());
+                            if (!(outCustodyConfig.symbol == 'SOL')) return [3, 1];
+                            lamports = this.minimumBalanceForRentExemptAccountLamports;
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -5532,22 +5483,21 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 6];
-                        case 2: return [4, (0, spl_token_1.getAssociatedTokenAddress)(outCustodyConfig.mintKey, publicKey, true)];
-                        case 3:
-                            userReceivingTokenAccount = _e.sent();
+                            return [3, 4];
+                        case 1:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(outCustodyConfig.mintKey, publicKey, true);
                             _a = createUserATA;
-                            if (!_a) return [3, 5];
+                            if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 4:
+                        case 2:
                             _a = !(_e.sent());
-                            _e.label = 5;
-                        case 5:
+                            _e.label = 3;
+                        case 3:
                             if (_a) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, outCustodyConfig.mintKey));
                             }
-                            _e.label = 6;
-                        case 6:
+                            _e.label = 4;
+                        case 4:
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
@@ -5572,15 +5522,10 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(compoundingTokenMint, publicKey, true)];
-                        case 7:
-                            compoundingTokenAccount = _e.sent();
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(outCustodyConfig.mintKey, publicKey, true)];
-                        case 8:
-                            receivingAccount = _e.sent();
-                            _e.label = 9;
-                        case 9:
-                            _e.trys.push([9, 11, , 12]);
+                            compoundingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(compoundingTokenMint, publicKey, true);
+                            _e.label = 5;
+                        case 5:
+                            _e.trys.push([5, 7, , 8]);
                             return [4, this.program.methods
                                     .removeCompoundingLiquidity({
                                     compoundingAmountIn: compoundingAmountIn,
@@ -5608,15 +5553,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
-                        case 10:
+                        case 6:
                             removeCompoundingLiquidity = _e.sent();
                             instructions.push(removeCompoundingLiquidity);
-                            return [3, 12];
-                        case 11:
+                            return [3, 8];
+                        case 7:
                             err_31 = _e.sent();
                             console.log("perpClient removeCompoundingLiquidity error:: ", err_31);
-                            return [3, 12];
-                        case 12: return [2, {
+                            return [3, 8];
+                        case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5639,16 +5584,14 @@ var PerpetualsClient = (function () {
                             rewardCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(rewardTokenMint); });
                             lpTokenMint = poolConfig.stakedLpTokenMint;
                             compoundingTokenMint = poolConfig.compoundingTokenMint;
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(compoundingTokenMint, publicKey, true)];
-                        case 1:
-                            compoudingTokenAccount = _e.sent();
+                            compoudingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(compoundingTokenMint, publicKey, true);
                             _a = createUserATA;
-                            if (!_a) return [3, 3];
+                            if (!_a) return [3, 2];
                             return [4, (0, utils_1.checkIfAccountExists)(compoudingTokenAccount, this.provider.connection)];
-                        case 2:
+                        case 1:
                             _a = !(_e.sent());
-                            _e.label = 3;
-                        case 3:
+                            _e.label = 2;
+                        case 2:
                             if (_a) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, compoudingTokenAccount, publicKey, compoundingTokenMint));
                             }
@@ -5678,9 +5621,9 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            _e.label = 4;
-                        case 4:
-                            _e.trys.push([4, 6, , 7]);
+                            _e.label = 3;
+                        case 3:
+                            _e.trys.push([3, 5, , 6]);
                             return [4, this.program.methods
                                     .migrateStake({
                                     amount: amount
@@ -5705,15 +5648,15 @@ var PerpetualsClient = (function () {
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                     .instruction()];
-                        case 5:
+                        case 4:
                             migrateStake = _e.sent();
                             instructions.push(migrateStake);
-                            return [3, 7];
-                        case 6:
+                            return [3, 6];
+                        case 5:
                             err_32 = _e.sent();
                             console.log("perpClient migrateStake error:: ", err_32);
-                            return [3, 7];
-                        case 7: return [2, {
+                            return [3, 6];
+                        case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5734,9 +5677,7 @@ var PerpetualsClient = (function () {
                         rewardCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(rewardTokenMint); });
                         lpTokenMint = poolConfig.stakedLpTokenMint;
                         compoundingTokenMint = poolConfig.compoundingTokenMint;
-                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(compoundingTokenMint, publicKey, true)];
-                    case 1:
-                        compoudingTokenAccount = _d.sent();
+                        compoudingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(compoundingTokenMint, publicKey, true);
                         flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
                         poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
                         custodyAccountMetas = [];
@@ -5763,9 +5704,9 @@ var PerpetualsClient = (function () {
                                 isWritable: false,
                             });
                         }
-                        _d.label = 2;
-                    case 2:
-                        _d.trys.push([2, 4, , 5]);
+                        _d.label = 1;
+                    case 1:
+                        _d.trys.push([1, 3, , 4]);
                         return [4, this.program.methods
                                 .migrateFlp({
                                 compoundingTokenAmount: amount
@@ -5791,15 +5732,15 @@ var PerpetualsClient = (function () {
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
                                 .instruction()];
-                    case 3:
+                    case 2:
                         migrateFlp = _d.sent();
                         instructions.push(migrateFlp);
-                        return [3, 5];
-                    case 4:
+                        return [3, 4];
+                    case 3:
                         err_33 = _d.sent();
                         console.log("perpClient migrateFlp error:: ", err_33);
-                        return [3, 5];
-                    case 5: return [2, {
+                        return [3, 4];
+                    case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -6016,10 +5957,8 @@ var PerpetualsClient = (function () {
                         additionalSigners = [];
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 4, , 5]);
-                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(rewardCustodyMint, publicKey, true)];
-                    case 2:
-                        fundingAccount = _a.sent();
+                        _a.trys.push([1, 3, , 4]);
+                        fundingAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                         rewardVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_vault")], this.programRewardDistribution.programId)[0];
                         rewardTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_token_account")], this.programRewardDistribution.programId)[0];
                         rewardRecord = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("reward_record"), owner.toBuffer(), rewardVault.toBuffer(), counter.toArrayLike(Buffer, 'le', 8)], this.programRewardDistribution.programId)[0];
@@ -6042,15 +5981,15 @@ var PerpetualsClient = (function () {
                                 program: this.programRewardDistribution.programId
                             })
                                 .instruction()];
-                    case 3:
+                    case 2:
                         distributeReward = _a.sent();
                         instructions.push(distributeReward);
-                        return [3, 5];
-                    case 4:
+                        return [3, 4];
+                    case 3:
                         err_38 = _a.sent();
                         console.log("rewardDistribution distributeReward error:: ", err_38);
                         throw err_38;
-                    case 5: return [2, {
+                    case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
                         }];
@@ -6070,17 +6009,15 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 6, , 7]);
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(rewardCustodyMint, publicKey, true)];
-                        case 2:
-                            receivingTokenAccount = _b.sent();
+                            _b.trys.push([1, 5, , 6]);
+                            receivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(rewardCustodyMint, publicKey, true);
                             _a = createUserATA;
-                            if (!_a) return [3, 4];
+                            if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
-                        case 3:
+                        case 2:
                             _a = !(_b.sent());
-                            _b.label = 4;
-                        case 4:
+                            _b.label = 3;
+                        case 3:
                             if (_a) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, receivingTokenAccount, publicKey, rewardCustodyMint));
                             }
@@ -6103,14 +6040,14 @@ var PerpetualsClient = (function () {
                                     program: this.programRewardDistribution.programId
                                 })
                                     .instruction()];
-                        case 5:
+                        case 4:
                             collectNftReward = _b.sent();
                             instructions.push(collectNftReward);
-                            return [3, 7];
-                        case 6:
+                            return [3, 6];
+                        case 5:
                             err_39 = _b.sent();
                             throw err_39;
-                        case 7: return [2, {
+                        case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -6132,6 +6069,7 @@ var PerpetualsClient = (function () {
         this.perpetuals = this.findProgramAddress("perpetuals");
         this.eventAuthority = this.findProgramAddress("__event_authority");
         this.eventAuthorityRewardDistribution = this.findProgramAddressFromProgramId("__event_authority", null, this.programRewardDistribution.programId);
+        this.minimumBalanceForRentExemptAccountLamports = 2039280;
         this.prioritizationFee = (opts === null || opts === void 0 ? void 0 : opts.prioritizationFee) || 0;
         this.useExtOracleAccount = useExtOracleAccount;
         this.postSendTxCallback = opts === null || opts === void 0 ? void 0 : opts.postSendTxCallback;