flash-sdk 2.52.1 → 2.52.3

package/dist/PerpetualsClient.js

@@ -2995,96 +2995,48 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.swap = function (userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1) {
+        this.addCollateral = function (collateralWithFee_1, targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1) {
             var args_1 = [];
-            for (var _i = 5; _i < arguments.length; _i++) {
-                args_1[_i - 5] = arguments[_i];
+            for (var _i = 6; _i < arguments.length; _i++) {
+                args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1], args_1, true), void 0, function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks, ephemeralSignerPubkey) {
-                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _e, _f, custody, params, inx, closeWsolATAIns, err_5;
-                if (useFeesPool === void 0) { useFeesPool = false; }
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (unWrapSol === void 0) { unWrapSol = false; }
+            return __awaiter(_this, __spreadArray([collateralWithFee_1, targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralWithFee, targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, userPayingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, instruction;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                return __generator(this, function (_g) {
-                    switch (_g.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
-                            userInputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey); });
-                            if (!userInputCustodyConfig) {
-                                throw "userInputCustodyConfig not found";
-                            }
-                            userOutputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey); });
-                            if (!userOutputCustodyConfig) {
-                                throw "userOutputCustodyConfig not found";
-                            }
                             publicKey = this.provider.wallet.publicKey;
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            if (!collateralCustodyConfig || !targetCustodyConfig) {
+                                throw "payTokenCustody not found";
+                            }
+                            userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true);
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            if (!(userInputTokenSymbol == 'SOL' && userOutputTokenSymbol == 'WSOL')) return [3, 5];
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, publicKey, true)];
-                        case 1:
-                            wsolAssociatedTokenAccount = _g.sent();
-                            return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
-                        case 2:
-                            wsolATAExist = _g.sent();
-                            if (!wsolATAExist) {
-                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
-                            }
-                            if (!!skipBalanceChecks) return [3, 4];
+                            if (!(collateralSymbol == 'SOL')) return [3, 3];
+                            console.log("collateralSymbol === SOL", collateralSymbol);
+                            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 3:
-                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _g.sent()]))();
-                            if (unWrappedSolBalance.lt(amountIn)) {
-                                throw "Insufficient SOL Funds";
-                            }
-                            _g.label = 4;
-                        case 4:
-                            instructions.push(web3_js_1.SystemProgram.transfer({
-                                fromPubkey: publicKey,
-                                toPubkey: wsolAssociatedTokenAccount,
-                                lamports: amountIn.toNumber(),
-                            }), (0, spl_token_1.createSyncNativeInstruction)(wsolAssociatedTokenAccount));
-                            return [2, {
-                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                                    additionalSigners: additionalSigners
-                                }];
-                        case 5:
-                            if (userInputTokenSymbol == 'WSOL' && userOutputTokenSymbol == 'SOL') {
-                                console.log("WSOL=> SOL : NOTE : ONLY WAY IS TO CLOSE THE WSOL ATA and GET ALL SOL ");
-                                wsolAssociatedTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, publicKey, true);
-                                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
-                                    }];
-                            }
-                            _g.label = 6;
-                        case 6:
-                            _g.trys.push([6, 19, , 20]);
-                            if (!(userInputTokenSymbol == 'SOL')) return [3, 9];
-                            console.log("userInputTokenSymbol === sol", userInputTokenSymbol);
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 7:
-                            accCreationLamports = (_g.sent());
-                            console.log("accCreationLamports:", accCreationLamports);
-                            lamports = amountIn.add(new anchor_1.BN(accCreationLamports));
-                            _b = anchor_1.BN.bind;
-                            return [4, this.provider.connection.getBalance(publicKey)];
-                        case 8:
-                            unWrappedSolBalance = new (_b.apply(anchor_1.BN, [void 0, _g.sent()]))();
-                            if (unWrappedSolBalance.lt(amountIn)) {
+                        case 1:
+                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
+                            if (unWrappedSolBalance.lt(lamports)) {
                                 throw "Insufficient SOL Funds";
                             }
+                            _c.label = 2;
+                        case 2:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
                             }
-                            ;
                             preInstructions = [
                                 web3_js_1.SystemProgram.createAccount({
                                     fromPubkey: publicKey,
@@ -3098,36 +3050,102 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 12];
-                        case 9:
-                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey, publicKey, true);
-                            return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
-                        case 10:
-                            if (!(_g.sent())) {
-                                throw "Insufficient Funds , Token Account doesn't exist";
+                            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, 12];
-                            _c = anchor_1.BN.bind;
-                            return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
-                        case 11:
-                            tokenAccountBalance = new (_c.apply(anchor_1.BN, [void 0, (_g.sent()).value.amount]))();
-                            if (tokenAccountBalance.lt(amountIn)) {
-                                throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
+                            _b = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getTokenAccountBalance(userPayingTokenAccount)];
+                        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");
                             }
-                            _g.label = 12;
-                        case 12:
-                            if (!(userOutputTokenSymbol == 'SOL')) return [3, 13];
-                            lamports = (this.minimumBalanceForRentExemptAccountLamports);
+                            _c.label = 6;
+                        case 6: return [4, this.program.methods.addCollateral({
+                                collateralDelta: collateralWithFee
+                            }).accounts({
+                                owner: publicKey,
+                                position: positionPubKey,
+                                market: marketAccount,
+                                fundingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userPayingTokenAccount,
+                                perpetuals: poolConfig.perpetuals,
+                                pool: poolConfig.poolAddress,
+                                targetCustody: targetCustodyConfig.custodyAccount,
+                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                collateralCustody: collateralCustodyConfig.custodyAccount,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                program: this.programId,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                            })
+                                .instruction()];
+                        case 7:
+                            instruction = _c.sent();
+                            instructions.push(instruction);
+                            return [2, {
+                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                    additionalSigners: additionalSigners
+                                }];
+                    }
+                });
+            });
+        };
+        this.swapAndAddCollateral = function (targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, minCollateralAmountOut_1, side_1, positionPubKey_1, poolConfig_1) {
+            var args_1 = [];
+            for (var _i = 8; _i < arguments.length; _i++) {
+                args_1[_i - 8] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, minCollateralAmountOut_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, inputSymbol, collateralSymbol, amountIn, minCollateralAmountOut, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, marketAccount, instruction;
+                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
+                            if (!collateralCustodyConfig || !targetCustodyConfig || !inputCustodyConfig) {
+                                throw "payTokenCustody not found";
+                            }
+                            if (inputCustodyConfig.mintKey.equals(collateralCustodyConfig.mintKey)) {
+                                throw "Use Simple Swap";
+                            }
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            if (!(inputSymbol == 'SOL')) return [3, 3];
+                            console.log("inputSymbol === SOL", inputSymbol);
+                            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 1:
+                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
+                            if (unWrappedSolBalance.lt(lamports)) {
+                                throw "Insufficient SOL Funds";
+                            }
+                            _c.label = 2;
+                        case 2:
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
                             }
-                            ;
                             preInstructions = [
                                 web3_js_1.SystemProgram.createAccount({
                                     fromPubkey: publicKey,
                                     newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                    lamports: lamports,
+                                    lamports: lamports.toNumber(),
                                     space: 165,
                                     programId: spl_token_1.TOKEN_PROGRAM_ID,
                                 }),
@@ -3136,193 +3154,102 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 17];
-                        case 13: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true)];
-                        case 14:
-                            userOutputTokenAccount = _g.sent();
-                            _d = createUserATA;
-                            if (!_d) return [3, 16];
-                            return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
-                        case 15:
-                            _d = !(_g.sent());
-                            _g.label = 16;
-                        case 16:
-                            if (_d) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey));
+                            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 (!(_c.sent())) {
+                                throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            _g.label = 17;
-                        case 17:
-                            custodyAccountMetas = [];
-                            custodyOracleAccountMetas = [];
-                            for (_e = 0, _f = poolConfig.custodies; _e < _f.length; _e++) {
-                                custody = _f[_e];
-                                custodyAccountMetas.push({
-                                    pubkey: custody.custodyAccount,
-                                    isSigner: false,
-                                    isWritable: false,
-                                });
-                                custodyOracleAccountMetas.push({
-                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
-                                    isSigner: false,
-                                    isWritable: false,
-                                });
+                            _b = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
+                        case 5:
+                            tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_c.sent()).value.amount]))();
+                            if (tokenAccountBalance.lt(amountIn)) {
+                                throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
                             }
-                            params = {
-                                amountIn: amountIn,
-                                minAmountOut: minAmountOut,
-                                useFeesPool: useFeesPool
-                            };
-                            return [4, this.program.methods
-                                    .swap(params)
-                                    .accounts({
-                                    owner: publicKey,
-                                    fundingAccount: userInputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
-                                    receivingAccount: userOutputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userOutputTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
+                            _c.label = 6;
+                        case 6:
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true);
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 7:
+                            if (!(_c.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralCustodyConfig.mintKey));
+                            }
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            return [4, this.program.methods.swapAndAddCollateral({
+                                    amountIn: amountIn,
+                                    minCollateralAmountOut: minCollateralAmountOut,
+                                }).accounts({
+                                    owner: publicKey,
+                                    feePayer: publicKey,
+                                    fundingAccount: inputSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
-                                    receivingCustody: userInputCustodyConfig.custodyAccount,
-                                    receivingCustodyOracleAccount: this.useExtOracleAccount ? userInputCustodyConfig.extOracleAccount : userInputCustodyConfig.intOracleAccount,
-                                    receivingCustodyTokenAccount: userInputCustodyConfig.tokenAccount,
-                                    dispensingCustody: userOutputCustodyConfig.custodyAccount,
-                                    dispensingCustodyOracleAccount: this.useExtOracleAccount ? userOutputCustodyConfig.extOracleAccount : userOutputCustodyConfig.intOracleAccount,
-                                    dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
+                                    receivingCustody: inputCustodyConfig.custodyAccount,
+                                    receivingCustodyOracleAccount: this.useExtOracleAccount ? inputCustodyConfig.extOracleAccount : inputCustodyConfig.intOracleAccount,
+                                    receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
+                                    position: positionPubKey,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
                                     .instruction()];
-                        case 18:
-                            inx = _g.sent();
-                            instructions.push(inx);
-                            if (userOutputTokenSymbol == 'SOL' && unWrapSol) {
-                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userOutputTokenAccount, publicKey, publicKey);
-                                instructions.push(closeWsolATAIns);
-                            }
-                            return [3, 20];
-                        case 19:
-                            err_5 = _g.sent();
-                            console.error("perpClient Swap error:: ", err_5);
-                            throw err_5;
-                        case 20: return [2, {
-                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                                additionalSigners: additionalSigners
-                            }];
+                        case 8:
+                            instruction = _c.sent();
+                            instructions.push(instruction);
+                            return [2, {
+                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                    additionalSigners: additionalSigners
+                                }];
                     }
                 });
             });
         };
-        this.swapFeeInternal = function (rewardTokenSymbol, swapTokenSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_6;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        rewardCustody = poolConfig.custodies.find(function (f) { return f.symbol == 'USDC'; });
-                        if (!rewardCustody) {
-                            throw "rewardCustody not found";
-                        }
-                        custody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(swapTokenSymbol).mintKey); });
-                        if (!custody) {
-                            throw "custody not found";
-                        }
-                        publicKey = this.provider.wallet.publicKey;
-                        preInstructions = [];
-                        instructions = [];
-                        postInstructions = [];
-                        additionalSigners = [];
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 3, , 4]);
-                        custodyAccountMetas = [];
-                        custodyOracleAccountMetas = [];
-                        for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
-                            custody_1 = _a[_i];
-                            custodyAccountMetas.push({
-                                pubkey: custody_1.custodyAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                            custodyOracleAccountMetas.push({
-                                pubkey: this.useExtOracleAccount ? custody_1.extOracleAccount : custody_1.intOracleAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        params = {};
-                        return [4, this.program.methods
-                                .swapFeeInternal(params)
-                                .accounts({
-                                owner: publicKey,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                rewardCustody: rewardCustody.custodyAccount,
-                                rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
-                                rewardCustodyTokenAccount: rewardCustody.tokenAccount,
-                                custody: custody.custodyAccount,
-                                custodyOracleAccount: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
-                                custodyTokenAccount: custody.tokenAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                program: this.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
-                                .instruction()];
-                    case 2:
-                        inx = _b.sent();
-                        instructions.push(inx);
-                        return [3, 4];
-                    case 3:
-                        err_6 = _b.sent();
-                        console.error("perpClient Swap error:: ", err_6);
-                        throw err_6;
-                    case 4: return [2, {
-                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
-        this.addCollateral = function (collateralWithFee_1, targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1) {
+        this.removeCollateral = function (collateralWithFee_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1) {
             var args_1 = [];
             for (var _i = 6; _i < arguments.length; _i++) {
                 args_1[_i - 6] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([collateralWithFee_1, targetSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralWithFee, targetSymbol, collateralSymbol, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, collateralCustodyConfig, targetCustodyConfig, marketAccount, userPayingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, instruction;
-                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            return __awaiter(_this, __spreadArray([collateralWithFee_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralWithFee, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, marketAccount, instruction, closeWsolATAIns, error_2;
+                if (createUserATA === void 0) { createUserATA = true; }
+                if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             publicKey = this.provider.wallet.publicKey;
-                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
-                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            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);
+                            });
                             if (!collateralCustodyConfig || !targetCustodyConfig) {
-                                throw "payTokenCustody not found";
+                                throw "collateralCustodyConfig/marketCustodyConfig  not found";
                             }
-                            userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true);
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
                             additionalSigners = [];
-                            if (!(collateralSymbol == 'SOL')) return [3, 3];
-                            console.log("collateralSymbol === SOL", collateralSymbol);
-                            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)];
+                            _b.label = 1;
                         case 1:
-                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
-                            if (unWrappedSolBalance.lt(lamports)) {
-                                throw "Insufficient SOL Funds";
-                            }
-                            _c.label = 2;
-                        case 2:
+                            _b.trys.push([1, 7, , 8]);
+                            console.log("removeCollateral  -- collateralSymbol:", collateralSymbol);
+                            if (!(collateralSymbol == 'SOL')) return [3, 2];
+                            console.log("remove collateral in SOL ...create WSOL temp and close it ");
+                            lamports = this.minimumBalanceForRentExemptAccountLamports;
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
                                 additionalSigners.push(wrappedSolAccount);
@@ -3331,7 +3258,7 @@ var PerpetualsClient = (function () {
                                 web3_js_1.SystemProgram.createAccount({
                                     fromPubkey: publicKey,
                                     newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                    lamports: lamports.toNumber(),
+                                    lamports: lamports,
                                     space: 165,
                                     programId: spl_token_1.TOKEN_PROGRAM_ID,
                                 }),
@@ -3340,278 +3267,61 @@ var PerpetualsClient = (function () {
                             postInstructions = [
                                 (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 6];
+                            return [3, 5];
+                        case 2:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
+                            _a = createUserATA;
+                            if (!_a) return [3, 4];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                         case 3:
-                            if (!!skipBalanceChecks) return [3, 6];
-                            return [4, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
+                            _a = !(_b.sent());
+                            _b.label = 4;
                         case 4:
-                            if (!(_c.sent())) {
-                                throw "Insufficient Funds , token Account doesn't exist";
+                            if (_a) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
-                            _b = anchor_1.BN.bind;
-                            return [4, this.provider.connection.getTokenAccountBalance(userPayingTokenAccount)];
+                            _b.label = 5;
                         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");
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            return [4, this.program.methods
+                                    .removeCollateral({
+                                    collateralDelta: collateralWithFee,
+                                })
+                                    .accounts({
+                                    owner: publicKey,
+                                    receivingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionPubKey,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .instruction()];
+                        case 6:
+                            instruction = _b.sent();
+                            instructions.push(instruction);
+                            if (collateralSymbol == 'WSOL' && closeUsersWSOLATA) {
+                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
+                                postInstructions.push(closeWsolATAIns);
                             }
-                            _c.label = 6;
-                        case 6: return [4, this.program.methods.addCollateral({
-                                collateralDelta: collateralWithFee
-                            }).accounts({
-                                owner: publicKey,
-                                position: positionPubKey,
-                                market: marketAccount,
-                                fundingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userPayingTokenAccount,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
-                                collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
-                                collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                program: this.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                            })
-                                .instruction()];
+                            return [3, 8];
                         case 7:
-                            instruction = _c.sent();
-                            instructions.push(instruction);
-                            return [2, {
-                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                                    additionalSigners: additionalSigners
-                                }];
-                    }
-                });
-            });
-        };
-        this.swapAndAddCollateral = function (targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, minCollateralAmountOut_1, side_1, positionPubKey_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 8; _i < arguments.length; _i++) {
-                args_1[_i - 8] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([targetSymbol_1, inputSymbol_1, collateralSymbol_1, amountIn_1, minCollateralAmountOut_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, inputSymbol, collateralSymbol, amountIn, minCollateralAmountOut, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, collateralCustodyConfig, targetCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, marketAccount, instruction;
-                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            publicKey = this.provider.wallet.publicKey;
-                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
-                            inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
-                            if (!collateralCustodyConfig || !targetCustodyConfig || !inputCustodyConfig) {
-                                throw "payTokenCustody not found";
-                            }
-                            if (inputCustodyConfig.mintKey.equals(collateralCustodyConfig.mintKey)) {
-                                throw "Use Simple Swap";
-                            }
-                            preInstructions = [];
-                            instructions = [];
-                            postInstructions = [];
-                            additionalSigners = [];
-                            if (!(inputSymbol == 'SOL')) return [3, 3];
-                            console.log("inputSymbol === SOL", inputSymbol);
-                            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 1:
-                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
-                            if (unWrappedSolBalance.lt(lamports)) {
-                                throw "Insufficient SOL Funds";
-                            }
-                            _c.label = 2;
-                        case 2:
-                            if (!ephemeralSignerPubkey) {
-                                wrappedSolAccount = new web3_js_1.Keypair();
-                                additionalSigners.push(wrappedSolAccount);
-                            }
-                            preInstructions = [
-                                web3_js_1.SystemProgram.createAccount({
-                                    fromPubkey: publicKey,
-                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                    lamports: lamports.toNumber(),
-                                    space: 165,
-                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
-                                }),
-                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
-                            ];
-                            postInstructions = [
-                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
-                            ];
-                            return [3, 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 (!(_c.sent())) {
-                                throw "Insufficient Funds , token Account doesn't exist";
-                            }
-                            _b = anchor_1.BN.bind;
-                            return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
-                        case 5:
-                            tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_c.sent()).value.amount]))();
-                            if (tokenAccountBalance.lt(amountIn)) {
-                                throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
-                            }
-                            _c.label = 6;
-                        case 6:
-                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true);
-                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
-                        case 7:
-                            if (!(_c.sent())) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralCustodyConfig.mintKey));
-                            }
-                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
-                            return [4, this.program.methods.swapAndAddCollateral({
-                                    amountIn: amountIn,
-                                    minCollateralAmountOut: minCollateralAmountOut,
-                                }).accounts({
-                                    owner: publicKey,
-                                    feePayer: publicKey,
-                                    fundingAccount: inputSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
-                                    receivingCustody: inputCustodyConfig.custodyAccount,
-                                    receivingCustodyOracleAccount: this.useExtOracleAccount ? inputCustodyConfig.extOracleAccount : inputCustodyConfig.intOracleAccount,
-                                    receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
-                                    position: positionPubKey,
-                                    market: marketAccount,
-                                    targetCustody: targetCustodyConfig.custodyAccount,
-                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
-                                    collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
-                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                                })
-                                    .instruction()];
-                        case 8:
-                            instruction = _c.sent();
-                            instructions.push(instruction);
-                            return [2, {
-                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                                    additionalSigners: additionalSigners
-                                }];
-                    }
-                });
-            });
-        };
-        this.removeCollateral = function (collateralWithFee_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1) {
-            var args_1 = [];
-            for (var _i = 6; _i < arguments.length; _i++) {
-                args_1[_i - 6] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([collateralWithFee_1, marketSymbol_1, collateralSymbol_1, side_1, positionPubKey_1, poolConfig_1], args_1, true), void 0, function (collateralWithFee, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
-                var publicKey, collateralCustodyConfig, targetCustodyConfig, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, marketAccount, instruction, closeWsolATAIns, error_2;
-                if (createUserATA === void 0) { createUserATA = true; }
-                if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
-                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            publicKey = this.provider.wallet.publicKey;
-                            collateralCustodyConfig = poolConfig.custodies.find(function (i) {
-                                return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey);
-                            });
-                            targetCustodyConfig = poolConfig.custodies.find(function (i) {
-                                return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey);
-                            });
-                            if (!collateralCustodyConfig || !targetCustodyConfig) {
-                                throw "collateralCustodyConfig/marketCustodyConfig  not found";
-                            }
-                            preInstructions = [];
-                            instructions = [];
-                            postInstructions = [];
-                            additionalSigners = [];
-                            _b.label = 1;
-                        case 1:
-                            _b.trys.push([1, 7, , 8]);
-                            console.log("removeCollateral  -- collateralSymbol:", collateralSymbol);
-                            if (!(collateralSymbol == 'SOL')) return [3, 2];
-                            console.log("remove collateral in SOL ...create WSOL temp and close it ");
-                            lamports = this.minimumBalanceForRentExemptAccountLamports;
-                            if (!ephemeralSignerPubkey) {
-                                wrappedSolAccount = new web3_js_1.Keypair();
-                                additionalSigners.push(wrappedSolAccount);
-                            }
-                            preInstructions = [
-                                web3_js_1.SystemProgram.createAccount({
-                                    fromPubkey: publicKey,
-                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                    lamports: lamports,
-                                    space: 165,
-                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
-                                }),
-                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
-                            ];
-                            postInstructions = [
-                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
-                            ];
-                            return [3, 5];
-                        case 2:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
-                            _a = createUserATA;
-                            if (!_a) return [3, 4];
-                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 3:
-                            _a = !(_b.sent());
-                            _b.label = 4;
-                        case 4:
-                            if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
-                            }
-                            _b.label = 5;
-                        case 5:
-                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
-                            return [4, this.program.methods
-                                    .removeCollateral({
-                                    collateralDelta: collateralWithFee,
-                                })
-                                    .accounts({
-                                    owner: publicKey,
-                                    receivingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
-                                    position: positionPubKey,
-                                    market: marketAccount,
-                                    targetCustody: targetCustodyConfig.custodyAccount,
-                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
-                                    collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
-                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                                })
-                                    .instruction()];
-                        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, 8];
-                        case 7:
-                            error_2 = _b.sent();
-                            console.error("perpclient removeCollateral error:", error_2);
-                            throw error_2;
-                        case 8: return [2, {
-                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                                additionalSigners: additionalSigners
-                            }];
+                            error_2 = _b.sent();
+                            console.error("perpclient removeCollateral error:", error_2);
+                            throw error_2;
+                        case 8: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
                     }
                 });
             });
@@ -3850,7 +3560,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 4] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([payTokenSymbol_1, tokenAmountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (payTokenSymbol, tokenAmountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, tokenAccountBalance, _f, instruction, err_7;
+                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, tokenAccountBalance, _f, instruction, err_5;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_g) {
@@ -3973,9 +3683,9 @@ var PerpetualsClient = (function () {
                             instructions.push(instruction);
                             return [3, 11];
                         case 10:
-                            err_7 = _g.sent();
-                            console.error("perpClient addLiquidity error:: ", err_7);
-                            throw err_7;
+                            err_5 = _g.sent();
+                            console.error("perpClient addLiquidity error:: ", err_5);
+                            throw err_5;
                         case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4125,7 +3835,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 4] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([recieveTokenSymbol_1, liquidityAmountIn_1, minTokenAmountOut_1, poolConfig_1], args_1, true), void 0, function (recieveTokenSymbol, liquidityAmountIn, minTokenAmountOut, poolConfig, closeLpATA, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey, userPublicKey) {
-                var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, _e, removeLiquidityTx, closeInx, closeWsolATAIns, err_8;
+                var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, _e, removeLiquidityTx, closeInx, closeWsolATAIns, err_6;
                 if (closeLpATA === void 0) { closeLpATA = false; }
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
@@ -4240,9 +3950,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 8];
                         case 7:
-                            err_8 = _f.sent();
-                            console.log("perpClient removeLiquidity error:: ", err_8);
-                            throw err_8;
+                            err_6 = _f.sent();
+                            console.log("perpClient removeLiquidity error:: ", err_6);
+                            throw err_6;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4252,7 +3962,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.addReferral = function (tokenStakeAccount, nftReferralAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addReferralInstruction, err_9;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addReferralInstruction, err_7;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4279,9 +3989,9 @@ var PerpetualsClient = (function () {
                         instructions.push(addReferralInstruction);
                         return [3, 4];
                     case 3:
-                        err_9 = _a.sent();
-                        console.log("perpClient addReferral error:: ", err_9);
-                        throw err_9;
+                        err_7 = _a.sent();
+                        console.log("perpClient addReferral error:: ", err_7);
+                        throw err_7;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4290,7 +4000,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.createNftTradingAccount = function (nftMint, owner, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, createNftTradingAccountInstruction, err_10;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, createNftTradingAccountInstruction, err_8;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4325,9 +4035,9 @@ var PerpetualsClient = (function () {
                         instructions.push(createNftTradingAccountInstruction);
                         return [3, 4];
                     case 3:
-                        err_10 = _a.sent();
-                        console.log("perpClient createNftAccount error:: ", err_10);
-                        throw err_10;
+                        err_8 = _a.sent();
+                        console.log("perpClient createNftAccount error:: ", err_8);
+                        throw err_8;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4336,7 +4046,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.updateNftAccount = function (nftMint, updateReferer, updateBooster, flpStakeAccounts) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, flpStakeAccountMetas, _i, flpStakeAccounts_1, flpStakeAccountPk, updateNftTradingAccountInstruction, err_11;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, flpStakeAccountMetas, _i, flpStakeAccounts_1, flpStakeAccountPk, updateNftTradingAccountInstruction, err_9;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4386,9 +4096,9 @@ var PerpetualsClient = (function () {
                         instructions.push(updateNftTradingAccountInstruction);
                         return [3, 5];
                     case 4:
-                        err_11 = _a.sent();
-                        console.log("perpClient updateNftAccount error:: ", err_11);
-                        throw err_11;
+                        err_9 = _a.sent();
+                        console.log("perpClient updateNftAccount error:: ", err_9);
+                        throw err_9;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4397,7 +4107,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.levelUp = function (poolConfig, nftMint, authorizationRulesAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, levelUpInstruction, err_12;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, levelUpInstruction, err_10;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4436,9 +4146,9 @@ var PerpetualsClient = (function () {
                         instructions.push(levelUpInstruction);
                         return [3, 4];
                     case 3:
-                        err_12 = _a.sent();
-                        console.log("perpClient levelUp error:: ", err_12);
-                        throw err_12;
+                        err_10 = _a.sent();
+                        console.log("perpClient levelUp error:: ", err_10);
+                        throw err_10;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4447,7 +4157,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.depositStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_13;
+            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_11;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4488,9 +4198,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_13 = _a.sent();
-                        console.log("perpClient depositStaking error:: ", err_13);
-                        throw err_13;
+                        err_11 = _a.sent();
+                        console.log("perpClient depositStaking error:: ", err_11);
+                        throw err_11;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4499,7 +4209,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.refreshStakeWithAllFlpStakeAccounts = function (rewardSymbol, poolConfig, flpStakeAccountPks) { return __awaiter(_this, void 0, void 0, function () {
-            var rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_1, flpStakeAccountPk, refreshStakeInstruction, err_14;
+            var rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_1, flpStakeAccountPk, refreshStakeInstruction, err_12;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -4546,9 +4256,9 @@ var PerpetualsClient = (function () {
                         refreshStakeInstruction = _c.sent();
                         return [2, refreshStakeInstruction];
                     case 2:
-                        err_14 = _c.sent();
-                        console.log("perpClient refreshStaking error:: ", err_14);
-                        throw err_14;
+                        err_12 = _c.sent();
+                        console.log("perpClient refreshStaking error:: ", err_12);
+                        throw err_12;
                     case 3: return [2];
                 }
             });
@@ -4559,7 +4269,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, flpStakeAccountPk_1], args_1, true), void 0, function (rewardSymbol, poolConfig, flpStakeAccountPk, userPublicKey) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _a, _b, custody, stakeAccountMetas, tokenStakeAccount, refreshStakeInstruction, err_15;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _a, _b, custody, stakeAccountMetas, tokenStakeAccount, refreshStakeInstruction, err_13;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 return __generator(this, function (_c) {
                     switch (_c.label) {
@@ -4607,9 +4317,9 @@ var PerpetualsClient = (function () {
                             refreshStakeInstruction = _c.sent();
                             return [2, refreshStakeInstruction];
                         case 2:
-                            err_15 = _c.sent();
-                            console.log("perpClient refreshStaking error:: ", err_15);
-                            throw err_15;
+                            err_13 = _c.sent();
+                            console.log("perpClient refreshStaking error:: ", err_13);
+                            throw err_13;
                         case 3: return [2];
                     }
                 });
@@ -4621,7 +4331,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([rewardSymbol_1, unstakeAmount_1, poolConfig_1], args_1, true), void 0, function (rewardSymbol, unstakeAmount, poolConfig, userPublicKey) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _a, unstakeInstantInstruction, err_16;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _a, unstakeInstantInstruction, err_14;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -4673,9 +4383,9 @@ var PerpetualsClient = (function () {
                             instructions.push(unstakeInstantInstruction);
                             return [3, 6];
                         case 5:
-                            err_16 = _b.sent();
-                            console.log("perpClient unstakeInstant error:: ", err_16);
-                            throw err_16;
+                            err_14 = _b.sent();
+                            console.log("perpClient unstakeInstant error:: ", err_14);
+                            throw err_14;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4685,7 +4395,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.setFeeShareBps = function (poolConfig, flpStakeAccountPks) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, pool, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_2, flpStakeAccountPk, refreshStakeInstruction, err_17;
+            var publicKey, pool, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_2, flpStakeAccountPk, refreshStakeInstruction, err_15;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -4729,15 +4439,15 @@ var PerpetualsClient = (function () {
                         refreshStakeInstruction = _c.sent();
                         return [2, refreshStakeInstruction];
                     case 2:
-                        err_17 = _c.sent();
-                        console.log("perpClient refreshStaking error:: ", err_17);
-                        throw err_17;
+                        err_15 = _c.sent();
+                        console.log("perpClient refreshStaking error:: ", err_15);
+                        throw err_15;
                     case 3: return [2];
                 }
             });
         }); };
         this.unstakeRequest = function (unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_18;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_16;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4771,9 +4481,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_18 = _a.sent();
-                        console.log("perpClient unstakeRequest error:: ", err_18);
-                        throw err_18;
+                        err_16 = _a.sent();
+                        console.log("perpClient unstakeRequest error:: ", err_16);
+                        throw err_16;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4787,7 +4497,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 1] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([poolConfig_1], args_1, true), void 0, function (poolConfig, pendingActivation, deactivated, createUserLPTA, userPublicKey) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_19;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_17;
                 if (pendingActivation === void 0) { pendingActivation = true; }
                 if (deactivated === void 0) { deactivated = true; }
                 if (createUserLPTA === void 0) { createUserLPTA = true; }
@@ -4842,9 +4552,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_19 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_19);
-                            throw err_19;
+                            err_17 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_17);
+                            throw err_17;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4859,7 +4569,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, tokenStakeAccount_1], args_1, true), void 0, function (rewardSymbol, poolConfig, tokenStakeAccount, createUserATA) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tokenStakeAccounts, withdrawStakeInstruction, err_20;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tokenStakeAccounts, withdrawStakeInstruction, err_18;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -4919,9 +4629,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_20 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_20);
-                            throw err_20;
+                            err_18 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_18);
+                            throw err_18;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4936,7 +4646,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 5] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([amountIn_1, minCompoundingAmountOut_1, inTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
-                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, addCompoundingLiquidity, err_21;
+                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, addCompoundingLiquidity, err_19;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
@@ -5062,8 +4772,8 @@ var PerpetualsClient = (function () {
                             instructions.push(addCompoundingLiquidity);
                             return [3, 10];
                         case 9:
-                            err_21 = _f.sent();
-                            console.log("perpClient addCompoundingLiquidity error:: ", err_21);
+                            err_19 = _f.sent();
+                            console.log("perpClient addCompoundingLiquidity error:: ", err_19);
                             return [3, 10];
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5079,7 +4789,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 5] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([compoundingAmountIn_1, minAmountOut_1, outTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (compoundingAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA, ephemeralSignerPubkey, userPublicKey) {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, compoundingTokenAccount, removeCompoundingLiquidity, err_22;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, compoundingTokenAccount, removeCompoundingLiquidity, err_20;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
@@ -5189,8 +4899,8 @@ var PerpetualsClient = (function () {
                             instructions.push(removeCompoundingLiquidity);
                             return [3, 8];
                         case 7:
-                            err_22 = _f.sent();
-                            console.log("perpClient removeCompoundingLiquidity error:: ", err_22);
+                            err_20 = _f.sent();
+                            console.log("perpClient removeCompoundingLiquidity error:: ", err_20);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5206,7 +4916,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([amount_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amount, rewardTokenMint, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _b, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, migrateStake, err_23;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _b, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, migrateStake, err_21;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_g) {
                     switch (_g.label) {
@@ -5304,8 +5014,8 @@ var PerpetualsClient = (function () {
                             instructions.push(migrateStake);
                             return [3, 8];
                         case 7:
-                            err_23 = _g.sent();
-                            console.log("perpClient migrateStake error:: ", err_23);
+                            err_21 = _g.sent();
+                            console.log("perpClient migrateStake error:: ", err_21);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5316,7 +5026,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.migrateFlp = function (amount, rewardTokenMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_24;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_22;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -5388,8 +5098,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_24 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_24);
+                        err_22 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_22);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5404,7 +5114,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 1] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([poolConfig_1], args_1, true), void 0, function (poolConfig, rewardTokenSymbol) {
-                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, compoundingFee, err_25;
+                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, compoundingFee, err_23;
                 if (rewardTokenSymbol === void 0) { rewardTokenSymbol = 'USDC'; }
                 return __generator(this, function (_e) {
                     switch (_e.label) {
@@ -5462,8 +5172,8 @@ var PerpetualsClient = (function () {
                             instructions.push(compoundingFee);
                             return [3, 4];
                         case 3:
-                            err_25 = _e.sent();
-                            console.log("perpClient compoundingFee error:: ", err_25);
+                            err_23 = _e.sent();
+                            console.log("perpClient compoundingFee error:: ", err_23);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -5474,7 +5184,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.burnAndClaim = function (owner, nftMint, poolConfig, createAta) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, userTokenAccount, _a, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndClaimInstruction, err_26;
+            var preInstructions, instructions, postInstructions, additionalSigners, userTokenAccount, _a, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndClaimInstruction, err_24;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -5538,9 +5248,9 @@ var PerpetualsClient = (function () {
                         instructions.push(burnAndClaimInstruction);
                         return [3, 8];
                     case 7:
-                        err_26 = _b.sent();
-                        console.log("perpClient burnAndClaimInstruction error:: ", err_26);
-                        throw err_26;
+                        err_24 = _b.sent();
+                        console.log("perpClient burnAndClaimInstruction error:: ", err_24);
+                        throw err_24;
                     case 8: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5549,7 +5259,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.burnAndStake = function (owner, feePayer, nftMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndStakeInstruction, err_27;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, nftTokenAccount, nftTradingAccount, metadataAccount, collectionMetadata, edition, tokenRecord, burnAndStakeInstruction, err_25;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5600,9 +5310,9 @@ var PerpetualsClient = (function () {
                         instructions.push(burnAndStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_27 = _a.sent();
-                        console.log("perpClient burnAndStakeInstruction error:: ", err_27);
-                        throw err_27;
+                        err_25 = _a.sent();
+                        console.log("perpClient burnAndStakeInstruction error:: ", err_25);
+                        throw err_25;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5611,7 +5321,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.depositTokenStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_28;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_26;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5652,9 +5362,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositTokenStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_28 = _a.sent();
-                        console.log("perpClient depositStakingInstruction error:: ", err_28);
-                        throw err_28;
+                        err_26 = _a.sent();
+                        console.log("perpClient depositStakingInstruction error:: ", err_26);
+                        throw err_26;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5663,7 +5373,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.unstakeTokenRequest = function (owner, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_29;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_27;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5692,9 +5402,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_29 = _a.sent();
-                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_29);
-                        throw err_29;
+                        err_27 = _a.sent();
+                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_27);
+                        throw err_27;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5703,7 +5413,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.unstakeTokenInstant = function (owner, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, unstakeTokenInstantInstruction, err_30;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, unstakeTokenInstantInstruction, err_28;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5743,9 +5453,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenInstantInstruction);
                         return [3, 5];
                     case 4:
-                        err_30 = _a.sent();
-                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_30);
-                        throw err_30;
+                        err_28 = _a.sent();
+                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_28);
+                        throw err_28;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5754,7 +5464,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawToken = function (owner, withdrawRequestId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_31;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_29;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5794,9 +5504,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawTokenInstruction);
                         return [3, 5];
                     case 4:
-                        err_31 = _a.sent();
-                        console.log("perpClient withdrawTokenInstruction error:: ", err_31);
-                        throw err_31;
+                        err_29 = _a.sent();
+                        console.log("perpClient withdrawTokenInstruction error:: ", err_29);
+                        throw err_29;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5805,7 +5515,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelUnstakeRequest = function (owner, withdrawRequestId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeRequestInstruction, err_32;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeRequestInstruction, err_30;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5834,9 +5544,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelUnstakeRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_32 = _a.sent();
-                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_32);
-                        throw err_32;
+                        err_30 = _a.sent();
+                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_30);
+                        throw err_30;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5850,7 +5560,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 2] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, poolConfig_1], args_1, true), void 0, function (owner, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, _a, collectTokenRewardInstruction, err_33;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, _a, collectTokenRewardInstruction, err_31;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -5895,9 +5605,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectTokenRewardInstruction);
                             return [3, 6];
                         case 5:
-                            err_33 = _b.sent();
-                            console.log("perpClient collectTokenRewardInstruction error:: ", err_33);
-                            throw err_33;
+                            err_31 = _b.sent();
+                            console.log("perpClient collectTokenRewardInstruction error:: ", err_31);
+                            throw err_31;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5912,7 +5622,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, rewardSymbol_1, poolConfig_1], args_1, true), void 0, function (owner, rewardSymbol, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_34;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_32;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -5958,9 +5668,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectRevenueInstruction);
                             return [3, 6];
                         case 5:
-                            err_34 = _b.sent();
-                            console.log("perpClient collectRevenueInstruction error:: ", err_34);
-                            throw err_34;
+                            err_32 = _b.sent();
+                            console.log("perpClient collectRevenueInstruction error:: ", err_32);
+                            throw err_32;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5970,7 +5680,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.initRewardVault = function (nftCount, rewardSymbol, collectionMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, nftTransferAuthority, initRewardVault, err_35;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, nftTransferAuthority, initRewardVault, err_33;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6007,9 +5717,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_35 = _a.sent();
-                        console.log("perpClient InitRewardVault error:: ", err_35);
-                        throw err_35;
+                        err_33 = _a.sent();
+                        console.log("perpClient InitRewardVault error:: ", err_33);
+                        throw err_33;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6018,7 +5728,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.distributeReward = function (rewardAmount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_36;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_34;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6049,9 +5759,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 4];
                     case 3:
-                        err_36 = _a.sent();
-                        console.log("perpClient distributeReward error:: ", err_36);
-                        throw err_36;
+                        err_34 = _a.sent();
+                        console.log("perpClient distributeReward error:: ", err_34);
+                        throw err_34;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6065,7 +5775,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, nftMint_1], args_1, true), void 0, function (rewardSymbol, poolConfig, nftMint, createUserATA) {
-                var publicKey, rewardCustodyMint, instructions, additionalSigners, nftTokenAccount, metadataAccount, receivingTokenAccount, _a, rewardRecord, rewardVault, rewardTokenAccount, nftTransferAuthority, collectNftReward, err_37;
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, nftTokenAccount, metadataAccount, receivingTokenAccount, _a, rewardRecord, rewardVault, rewardTokenAccount, nftTransferAuthority, collectNftReward, err_35;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -6116,8 +5826,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectNftReward);
                             return [3, 6];
                         case 5:
-                            err_37 = _b.sent();
-                            throw err_37;
+                            err_35 = _b.sent();
+                            throw err_35;
                         case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners
@@ -6132,7 +5842,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 2] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1], args_1, true), void 0, function (rewardSymbol, poolConfig, createUserATA, nftTradingAccount) {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, rewardVault, rewardTokenAccount, withdrawStakeInstruction, err_38;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, rewardVault, rewardTokenAccount, withdrawStakeInstruction, err_36;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -6197,9 +5907,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_38 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_38);
-                            throw err_38;
+                            err_36 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_36);
+                            throw err_36;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6209,7 +5919,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.setTriggerPrice = function (targetSymbol, collateralSymbol, side, triggerPrice, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, positionAccount, instructions, additionalSigners, setTriggerPrice, err_39;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, positionAccount, instructions, additionalSigners, setTriggerPrice, err_37;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6248,9 +5958,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTriggerPrice);
                         return [3, 4];
                     case 3:
-                        err_39 = _a.sent();
-                        console.log("perpClient setTriggerPrice error:: ", err_39);
-                        throw err_39;
+                        err_37 = _a.sent();
+                        console.log("perpClient setTriggerPrice error:: ", err_37);
+                        throw err_37;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6264,7 +5974,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 6] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([positionAccount_2, targetSymbol_1, collateralSymbol_1, side_1, isStopLoss_1, poolConfig_1], args_1, true), void 0, function (positionAccount, targetSymbol, collateralSymbol, side, isStopLoss, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, forceClosePosition, closeWsolATAIns, err_40;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, forceClosePosition, closeWsolATAIns, err_38;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
@@ -6328,9 +6038,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 7];
                         case 6:
-                            err_40 = _b.sent();
-                            console.log("perpClient forceClosePosition error:: ", err_40);
-                            throw err_40;
+                            err_38 = _b.sent();
+                            console.log("perpClient forceClosePosition error:: ", err_38);
+                            throw err_38;
                         case 7: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6345,7 +6055,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 11] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, limitPrice_1, reserveAmount_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, limitPrice, reserveAmount, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_41;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_39;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
@@ -6452,9 +6162,9 @@ var PerpetualsClient = (function () {
                             instructions.push(placeLimitOrder);
                             return [3, 11];
                         case 10:
-                            err_41 = _c.sent();
-                            console.log("perpClient placeLimitOrder error:: ", err_41);
-                            throw err_41;
+                            err_39 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_39);
+                            throw err_39;
                         case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6469,7 +6179,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 11] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, orderId_1, limitPrice_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey) {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_42;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_40;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_b) {
@@ -6559,9 +6269,9 @@ var PerpetualsClient = (function () {
                             instructions.push(editLimitOrder);
                             return [3, 8];
                         case 7:
-                            err_42 = _b.sent();
-                            console.log("perpClient editLimitOrder error:: ", err_42);
-                            throw err_42;
+                            err_40 = _b.sent();
+                            console.log("perpClient editLimitOrder error:: ", err_40);
+                            throw err_40;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6576,7 +6286,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 7] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([userPubkey_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, poolConfig_1, privilege_1], args_1, true), void 0, function (userPubkey, targetSymbol, collateralSymbol, side, orderId, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_43;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_41;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
                 if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
@@ -6628,9 +6338,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitOrder);
                             return [3, 4];
                         case 3:
-                            err_43 = _a.sent();
-                            console.log("perpClient executeLimitOrder error:: ", err_43);
-                            throw err_43;
+                            err_41 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_41);
+                            throw err_41;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6645,7 +6355,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 8] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([userPubkey_1, targetSymbol_1, collateralSymbol_1, reserveSymbol_1, side_1, orderId_1, poolConfig_1, privilege_1], args_1, true), void 0, function (userPubkey, targetSymbol, collateralSymbol, reserveSymbol, side, orderId, poolConfig, privilege, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitWithSwap, err_44;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitWithSwap, err_42;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
                 if (rebateTokenAccount === void 0) { rebateTokenAccount = web3_js_1.PublicKey.default; }
@@ -6700,9 +6410,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitWithSwap);
                             return [3, 4];
                         case 3:
-                            err_44 = _a.sent();
-                            console.log("perpClient executeLimitWithSwap error:: ", err_44);
-                            throw err_44;
+                            err_42 = _a.sent();
+                            console.log("perpClient executeLimitWithSwap error:: ", err_42);
+                            throw err_42;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6712,7 +6422,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.placeTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_45;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_43;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6760,9 +6470,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_45 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_45);
-                        throw err_45;
+                        err_43 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_43);
+                        throw err_43;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6771,7 +6481,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.editTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_46;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_44;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6818,9 +6528,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_46 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_46);
-                        throw err_46;
+                        err_44 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_44);
+                        throw err_44;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6829,7 +6539,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_47;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_45;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6862,9 +6572,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_47 = _a.sent();
-                        console.log("perpClient cancelTriggerOrder error:: ", err_47);
-                        throw err_47;
+                        err_45 = _a.sent();
+                        console.log("perpClient cancelTriggerOrder error:: ", err_45);
+                        throw err_45;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6873,7 +6583,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelAllTriggerOrders = function (targetSymbol, collateralSymbol, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_48;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_46;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6904,9 +6614,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelAllTriggerOrders);
                         return [3, 4];
                     case 3:
-                        err_48 = _a.sent();
-                        console.log("perpClient cancelAllTriggerOrders error:: ", err_48);
-                        throw err_48;
+                        err_46 = _a.sent();
+                        console.log("perpClient cancelAllTriggerOrders error:: ", err_46);
+                        throw err_46;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6920,7 +6630,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 9] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, targetSymbol_1, collateralSymbol_1, receivingSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1], args_1, true), void 0, function (owner, targetSymbol, collateralSymbol, receivingSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _c, _d, custody, executeTriggerWithSwap, err_49;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _c, _d, custody, executeTriggerWithSwap, err_47;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
@@ -7022,9 +6732,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerWithSwap);
                             return [3, 10];
                         case 9:
-                            err_49 = _e.sent();
-                            console.log("perpClient executeTriggerWithSwap error:: ", err_49);
-                            throw err_49;
+                            err_47 = _e.sent();
+                            console.log("perpClient executeTriggerWithSwap error:: ", err_47);
+                            throw err_47;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -7039,7 +6749,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 8] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1], args_1, true), void 0, function (owner, targetSymbol, collateralSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount, rebateTokenAccount) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_50;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_48;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
@@ -7110,9 +6820,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerOrder);
                             return [3, 8];
                         case 7:
-                            err_50 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_50);
-                            throw err_50;
+                            err_48 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_48);
+                            throw err_48;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -7122,7 +6832,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.migrateTriggerOrder = function (owner, marketAccount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var payerPubkey, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_51;
+            var payerPubkey, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_49;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7152,8 +6862,298 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_51 = _a.sent();
-                        console.log("perpClient migrateTriggerOrder error:: ", err_51);
+                        err_49 = _a.sent();
+                        console.log("perpClient migrateTriggerOrder error:: ", err_49);
+                        throw err_49;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.swap = function (userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1) {
+            var args_1 = [];
+            for (var _i = 5; _i < arguments.length; _i++) {
+                args_1[_i - 5] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1], args_1, true), void 0, function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks, ephemeralSignerPubkey) {
+                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _e, _f, custody, params, inx, closeWsolATAIns, err_50;
+                if (useFeesPool === void 0) { useFeesPool = false; }
+                if (createUserATA === void 0) { createUserATA = true; }
+                if (unWrapSol === void 0) { unWrapSol = false; }
+                if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+                if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
+                        case 0:
+                            userInputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey); });
+                            if (!userInputCustodyConfig) {
+                                throw "userInputCustodyConfig not found";
+                            }
+                            userOutputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey); });
+                            if (!userOutputCustodyConfig) {
+                                throw "userOutputCustodyConfig not found";
+                            }
+                            publicKey = this.provider.wallet.publicKey;
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            if (!(userInputTokenSymbol == 'SOL' && userOutputTokenSymbol == 'WSOL')) return [3, 5];
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, publicKey, true)];
+                        case 1:
+                            wsolAssociatedTokenAccount = _g.sent();
+                            return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
+                        case 2:
+                            wsolATAExist = _g.sent();
+                            if (!wsolATAExist) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
+                            }
+                            if (!!skipBalanceChecks) return [3, 4];
+                            _a = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getBalance(publicKey)];
+                        case 3:
+                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _g.sent()]))();
+                            if (unWrappedSolBalance.lt(amountIn)) {
+                                throw "Insufficient SOL Funds";
+                            }
+                            _g.label = 4;
+                        case 4:
+                            instructions.push(web3_js_1.SystemProgram.transfer({
+                                fromPubkey: publicKey,
+                                toPubkey: wsolAssociatedTokenAccount,
+                                lamports: amountIn.toNumber(),
+                            }), (0, spl_token_1.createSyncNativeInstruction)(wsolAssociatedTokenAccount));
+                            return [2, {
+                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                    additionalSigners: additionalSigners
+                                }];
+                        case 5:
+                            if (userInputTokenSymbol == 'WSOL' && userOutputTokenSymbol == 'SOL') {
+                                console.log("WSOL=> SOL : NOTE : ONLY WAY IS TO CLOSE THE WSOL ATA and GET ALL SOL ");
+                                wsolAssociatedTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, publicKey, true);
+                                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
+                                    }];
+                            }
+                            _g.label = 6;
+                        case 6:
+                            _g.trys.push([6, 19, , 20]);
+                            if (!(userInputTokenSymbol == 'SOL')) return [3, 9];
+                            console.log("userInputTokenSymbol === sol", userInputTokenSymbol);
+                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
+                        case 7:
+                            accCreationLamports = (_g.sent());
+                            console.log("accCreationLamports:", accCreationLamports);
+                            lamports = amountIn.add(new anchor_1.BN(accCreationLamports));
+                            _b = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getBalance(publicKey)];
+                        case 8:
+                            unWrappedSolBalance = new (_b.apply(anchor_1.BN, [void 0, _g.sent()]))();
+                            if (unWrappedSolBalance.lt(amountIn)) {
+                                throw "Insufficient SOL Funds";
+                            }
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
+                                additionalSigners.push(wrappedSolAccount);
+                            }
+                            ;
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports.toNumber(),
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
+                            ];
+                            return [3, 12];
+                        case 9:
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey, publicKey, true);
+                            return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
+                        case 10:
+                            if (!(_g.sent())) {
+                                throw "Insufficient Funds , Token Account doesn't exist";
+                            }
+                            if (!!skipBalanceChecks) return [3, 12];
+                            _c = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
+                        case 11:
+                            tokenAccountBalance = new (_c.apply(anchor_1.BN, [void 0, (_g.sent()).value.amount]))();
+                            if (tokenAccountBalance.lt(amountIn)) {
+                                throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
+                            }
+                            _g.label = 12;
+                        case 12:
+                            if (!(userOutputTokenSymbol == 'SOL')) return [3, 13];
+                            lamports = (this.minimumBalanceForRentExemptAccountLamports);
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
+                                additionalSigners.push(wrappedSolAccount);
+                            }
+                            ;
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports,
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
+                            ];
+                            return [3, 17];
+                        case 13: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true)];
+                        case 14:
+                            userOutputTokenAccount = _g.sent();
+                            _d = createUserATA;
+                            if (!_d) return [3, 16];
+                            return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
+                        case 15:
+                            _d = !(_g.sent());
+                            _g.label = 16;
+                        case 16:
+                            if (_d) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey));
+                            }
+                            _g.label = 17;
+                        case 17:
+                            custodyAccountMetas = [];
+                            custodyOracleAccountMetas = [];
+                            for (_e = 0, _f = poolConfig.custodies; _e < _f.length; _e++) {
+                                custody = _f[_e];
+                                custodyAccountMetas.push({
+                                    pubkey: custody.custodyAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyOracleAccountMetas.push({
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            params = {
+                                amountIn: amountIn,
+                                minAmountOut: minAmountOut,
+                                useFeesPool: useFeesPool
+                            };
+                            return [4, this.program.methods
+                                    .swap(params)
+                                    .accounts({
+                                    owner: publicKey,
+                                    fundingAccount: userInputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
+                                    receivingAccount: userOutputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userOutputTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    receivingCustody: userInputCustodyConfig.custodyAccount,
+                                    receivingCustodyOracleAccount: this.useExtOracleAccount ? userInputCustodyConfig.extOracleAccount : userInputCustodyConfig.intOracleAccount,
+                                    receivingCustodyTokenAccount: userInputCustodyConfig.tokenAccount,
+                                    dispensingCustody: userOutputCustodyConfig.custodyAccount,
+                                    dispensingCustodyOracleAccount: this.useExtOracleAccount ? userOutputCustodyConfig.extOracleAccount : userOutputCustodyConfig.intOracleAccount,
+                                    dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
+                                    .instruction()];
+                        case 18:
+                            inx = _g.sent();
+                            instructions.push(inx);
+                            if (userOutputTokenSymbol == 'SOL' && unWrapSol) {
+                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userOutputTokenAccount, publicKey, publicKey);
+                                instructions.push(closeWsolATAIns);
+                            }
+                            return [3, 20];
+                        case 19:
+                            err_50 = _g.sent();
+                            console.error("perpClient Swap error:: ", err_50);
+                            throw err_50;
+                        case 20: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
+        this.swapFeeInternal = function (rewardTokenSymbol, swapTokenSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_51;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        rewardCustody = poolConfig.custodies.find(function (f) { return f.symbol == 'USDC'; });
+                        if (!rewardCustody) {
+                            throw "rewardCustody not found";
+                        }
+                        custody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(swapTokenSymbol).mintKey); });
+                        if (!custody) {
+                            throw "custody not found";
+                        }
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        custodyAccountMetas = [];
+                        custodyOracleAccountMetas = [];
+                        for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                            custody_1 = _a[_i];
+                            custodyAccountMetas.push({
+                                pubkey: custody_1.custodyAccount,
+                                isSigner: false,
+                                isWritable: false,
+                            });
+                            custodyOracleAccountMetas.push({
+                                pubkey: this.useExtOracleAccount ? custody_1.extOracleAccount : custody_1.intOracleAccount,
+                                isSigner: false,
+                                isWritable: false,
+                            });
+                        }
+                        params = {};
+                        return [4, this.program.methods
+                                .swapFeeInternal(params)
+                                .accounts({
+                                owner: publicKey,
+                                perpetuals: poolConfig.perpetuals,
+                                pool: poolConfig.poolAddress,
+                                rewardCustody: rewardCustody.custodyAccount,
+                                rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
+                                rewardCustodyTokenAccount: rewardCustody.tokenAccount,
+                                custody: custody.custodyAccount,
+                                custodyOracleAccount: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
+                                custodyTokenAccount: custody.tokenAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                program: this.programId,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                            })
+                                .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
+                                .instruction()];
+                    case 2:
+                        inx = _b.sent();
+                        instructions.push(inx);
+                        return [3, 4];
+                    case 3:
+                        err_51 = _b.sent();
+                        console.error("perpClient Swap error:: ", err_51);
                         throw err_51;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),