flash-sdk 2.23.2 → 2.24.1

package/dist/PerpetualsClient.js

@@ -2954,6 +2954,264 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.swapAndOpen = function (targetTokenSymbol, collateralTokenSymbol, userInputTokenSymbol, amountIn, minCollateralAmountOut, priceWithSlippage, sizeAmount, side, poolConfig, privilege, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, skipBalanceChecks, ephemeralSignerPubkey) {
+            if (nftTradingAccount === void 0) { nftTradingAccount = web3_js_1.PublicKey.default; }
+            if (nftReferralAccount === void 0) { nftReferralAccount = web3_js_1.PublicKey.default; }
+            if (nftRebateTokenAccount === void 0) { nftRebateTokenAccount = web3_js_1.PublicKey.default; }
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, userInputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userOutputTokenAccount, inx, err_2;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            userInputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(userInputTokenSymbol).mintKey); });
+                            if (!userInputCustodyConfig) {
+                                throw "userInputCustodyConfig not found";
+                            }
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralTokenSymbol).mintKey); });
+                            if (!collateralCustodyConfig) {
+                                throw "collateralCustodyConfig not found";
+                            }
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetTokenSymbol).mintKey); });
+                            if (!targetCustodyConfig) {
+                                throw "targetCustodyConfig not found";
+                            }
+                            if (userInputCustodyConfig.mintKey.equals(collateralCustodyConfig.mintKey)) {
+                                throw "Don't use Swap, just call Open position";
+                            }
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            if (!(userInputTokenSymbol == 'SOL')) return [3, 3];
+                            console.log("inputSymbol === SOL", userInputTokenSymbol);
+                            lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
+                            if (!!skipBalanceChecks) return [3, 2];
+                            _a = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getBalance(publicKey)];
+                        case 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)(poolConfig.getTokenFromSymbol(userInputTokenSymbol).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:
+                            userOutputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey, publicKey, true);
+                            return [4, (0, utils_1.checkIfAccountExists)(userOutputTokenAccount, this.provider.connection)];
+                        case 7:
+                            if (!(_c.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userOutputTokenAccount, publicKey, poolConfig.getTokenFromSymbol(targetCustodyConfig.symbol).mintKey));
+                            }
+                            _c.label = 8;
+                        case 8:
+                            _c.trys.push([8, 10, , 11]);
+                            return [4, this.program.methods
+                                    .swapAndOpen({
+                                    amountIn: amountIn,
+                                    minCollateralAmountOut: minCollateralAmountOut,
+                                    priceWithSlippage: priceWithSlippage,
+                                    sizeAmount: sizeAmount,
+                                    privilege: privilege
+                                })
+                                    .accounts({
+                                    owner: publicKey,
+                                    feePayer: publicKey,
+                                    fundingAccount: userInputTokenSymbol == '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,
+                                    position: positionAccount,
+                                    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,
+                                    systemProgram: web3_js_1.SystemProgram.programId,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
+                                    .instruction()];
+                        case 9:
+                            inx = _c.sent();
+                            instructions.push(inx);
+                            return [3, 11];
+                        case 10:
+                            err_2 = _c.sent();
+                            console.error("perpClient SwapAndOpen error:: ", err_2);
+                            throw err_2;
+                        case 11: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
+        this.closeAndSwap = function (targetTokenSymbol, userOutputTokenSymbol, collateralTokenSymbol, minSwapAmountOut, priceWithSlippage, side, poolConfig, privilege, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, ephemeralSignerPubkey) {
+            if (nftTradingAccount === void 0) { nftTradingAccount = web3_js_1.PublicKey.default; }
+            if (nftReferralAccount === void 0) { nftReferralAccount = web3_js_1.PublicKey.default; }
+            if (nftRebateTokenAccount === void 0) { nftRebateTokenAccount = web3_js_1.PublicKey.default; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, userOutputCustodyConfig, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, inx, err_3;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            userOutputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey); });
+                            if (!userOutputCustodyConfig) {
+                                throw "userOutputCustodyConfig not found";
+                            }
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralTokenSymbol).mintKey); });
+                            if (!collateralCustodyConfig) {
+                                throw "collateralCustodyConfig not found";
+                            }
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetTokenSymbol).mintKey); });
+                            if (!targetCustodyConfig) {
+                                throw "targetCustodyConfig not found";
+                            }
+                            if (userOutputCustodyConfig.mintKey.equals(collateralCustodyConfig.mintKey)) {
+                                throw "Dont use swap, just call close position";
+                            }
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            if (!(userOutputTokenSymbol == 'SOL')) return [3, 1];
+                            console.log("outputSymbol === SOL", userOutputTokenSymbol);
+                            lamports = (this.minimumBalanceForRentExemptAccountLamports);
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
+                                additionalSigners.push(wrappedSolAccount);
+                            }
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports,
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
+                            ];
+                            additionalSigners.push(wrappedSolAccount);
+                            return [3, 4];
+                        case 1: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey, publicKey, true)];
+                        case 2:
+                            userReceivingTokenAccount = _a.sent();
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
+                            if (!(_a.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(userOutputTokenSymbol).mintKey));
+                            }
+                            _a.label = 4;
+                        case 4:
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralTokenSymbol).mintKey, publicKey, true);
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 5:
+                            if (!(_a.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralTokenSymbol).mintKey));
+                            }
+                            _a.label = 6;
+                        case 6:
+                            _a.trys.push([6, 8, , 9]);
+                            return [4, this.program.methods
+                                    .closeAndSwap({
+                                    priceWithSlippage: priceWithSlippage,
+                                    minSwapAmountOut: minSwapAmountOut,
+                                    privilege: privilege
+                                })
+                                    .accounts({
+                                    owner: publicKey,
+                                    feePayer: publicKey,
+                                    receivingAccount: userOutputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
+                                    collateralAccount: userCollateralTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionAccount,
+                                    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,
+                                    dispensingCustody: userOutputCustodyConfig.custodyAccount,
+                                    dispensingOracleAccount: this.useExtOracleAccount ? userOutputCustodyConfig.extOracleAccount : userOutputCustodyConfig.intOracleAccount,
+                                    dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
+                                    .instruction()];
+                        case 7:
+                            inx = _a.sent();
+                            instructions.push(inx);
+                            return [3, 9];
+                        case 8:
+                            err_3 = _a.sent();
+                            console.error("perpClient CloseAndSwap error:: ", err_3);
+                            throw err_3;
+                        case 9: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
         this.swap = function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks, ephemeralSignerPubkey) {
             if (useFeesPool === void 0) { useFeesPool = false; }
             if (createUserATA === void 0) { createUserATA = true; }
@@ -2961,7 +3219,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _i, _e, custody, params, inx, closeWsolATAIns, err_2;
+                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _i, _e, custody, params, inx, closeWsolATAIns, err_4;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -3158,9 +3416,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 20];
                         case 19:
-                            err_2 = _f.sent();
-                            console.error("perpClient Swap error:: ", err_2);
-                            throw err_2;
+                            err_4 = _f.sent();
+                            console.error("perpClient Swap error:: ", err_4);
+                            throw err_4;
                         case 20: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -3170,7 +3428,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.swapFeeInternal = function (rewardTokenSymbol, swapTokenSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_3;
+            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_5;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -3230,9 +3488,9 @@ var PerpetualsClient = (function () {
                         instructions.push(inx);
                         return [3, 4];
                     case 3:
-                        err_3 = _b.sent();
-                        console.error("perpClient Swap error:: ", err_3);
-                        throw err_3;
+                        err_5 = _b.sent();
+                        console.error("perpClient Swap error:: ", err_5);
+                        throw err_5;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -3820,7 +4078,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, tokenAccountBalance, _e, instruction, err_4;
+                var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, tokenAccountBalance, _e, instruction, err_6;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -3941,9 +4199,9 @@ var PerpetualsClient = (function () {
                             instructions.push(instruction);
                             return [3, 11];
                         case 10:
-                            err_4 = _f.sent();
-                            console.error("perpClient addLiquidity error:: ", err_4);
-                            throw err_4;
+                            err_6 = _f.sent();
+                            console.error("perpClient addLiquidity error:: ", err_6);
+                            throw err_6;
                         case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4088,7 +4346,7 @@ var PerpetualsClient = (function () {
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, _d, removeLiquidityTx, closeInx, closeWsolATAIns, err_5;
+                var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, _d, removeLiquidityTx, closeInx, closeWsolATAIns, err_7;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -4198,9 +4456,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 8];
                         case 7:
-                            err_5 = _e.sent();
-                            console.log("perpClient removeLiquidity error:: ", err_5);
-                            throw err_5;
+                            err_7 = _e.sent();
+                            console.log("perpClient removeLiquidity error:: ", err_7);
+                            throw err_7;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4210,7 +4468,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.addReferral = function (nftTradingAccount, nftReferralAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addReferralInstruction, err_6;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addReferralInstruction, err_8;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4237,9 +4495,9 @@ var PerpetualsClient = (function () {
                         instructions.push(addReferralInstruction);
                         return [3, 4];
                     case 3:
-                        err_6 = _a.sent();
-                        console.log("perpClient addReferral error:: ", err_6);
-                        throw err_6;
+                        err_8 = _a.sent();
+                        console.log("perpClient addReferral error:: ", err_8);
+                        throw err_8;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4248,7 +4506,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, nftTokenAccount, createNftTradingAccountInstruction, err_7;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, nftTokenAccount, createNftTradingAccountInstruction, err_9;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4286,9 +4544,9 @@ var PerpetualsClient = (function () {
                         instructions.push(createNftTradingAccountInstruction);
                         return [3, 4];
                     case 3:
-                        err_7 = _a.sent();
-                        console.log("perpClient createNftAccount error:: ", err_7);
-                        throw err_7;
+                        err_9 = _a.sent();
+                        console.log("perpClient createNftAccount error:: ", err_9);
+                        throw err_9;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4297,7 +4555,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_8;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, flpStakeAccountMetas, _i, flpStakeAccounts_1, flpStakeAccountPk, updateNftTradingAccountInstruction, err_10;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4347,9 +4605,9 @@ var PerpetualsClient = (function () {
                         instructions.push(updateNftTradingAccountInstruction);
                         return [3, 5];
                     case 4:
-                        err_8 = _a.sent();
-                        console.log("perpClient updateNftAccount error:: ", err_8);
-                        throw err_8;
+                        err_10 = _a.sent();
+                        console.log("perpClient updateNftAccount error:: ", err_10);
+                        throw err_10;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4358,7 +4616,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_9;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, metadataAccount, levelUpInstruction, err_11;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4397,9 +4655,9 @@ var PerpetualsClient = (function () {
                         instructions.push(levelUpInstruction);
                         return [3, 4];
                     case 3:
-                        err_9 = _a.sent();
-                        console.log("perpClient levelUp error:: ", err_9);
-                        throw err_9;
+                        err_11 = _a.sent();
+                        console.log("perpClient levelUp error:: ", err_11);
+                        throw err_11;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4408,7 +4666,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initStake = function (stakingFeeShareBps, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_10;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_12;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4446,9 +4704,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_10 = _a.sent();
-                        console.log("perpClient InitStaking error:: ", err_10);
-                        throw err_10;
+                        err_12 = _a.sent();
+                        console.log("perpClient InitStaking error:: ", err_12);
+                        throw err_12;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4457,7 +4715,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initCompounding = function (feeShareBps, metadataTitle, metadataSymbol, metadataUri, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_11;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_13;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4502,9 +4760,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initCompoundingInstruction);
                         return [3, 4];
                     case 3:
-                        err_11 = _a.sent();
-                        console.log("perpClient initCompounding error:: ", err_11);
-                        throw err_11;
+                        err_13 = _a.sent();
+                        console.log("perpClient initCompounding error:: ", err_13);
+                        throw err_13;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4513,7 +4771,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_12;
+            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_14;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4554,9 +4812,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_12 = _a.sent();
-                        console.log("perpClient depositStaking error:: ", err_12);
-                        throw err_12;
+                        err_14 = _a.sent();
+                        console.log("perpClient depositStaking error:: ", err_14);
+                        throw err_14;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4599,7 +4857,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.refreshStake = 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_13;
+            var rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_1, flpStakeAccountPk, refreshStakeInstruction, err_15;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -4646,15 +4904,15 @@ var PerpetualsClient = (function () {
                         refreshStakeInstruction = _c.sent();
                         return [2, refreshStakeInstruction];
                     case 2:
-                        err_13 = _c.sent();
-                        console.log("perpClient refreshStaking error:: ", err_13);
-                        throw err_13;
+                        err_15 = _c.sent();
+                        console.log("perpClient refreshStaking error:: ", err_15);
+                        throw err_15;
                     case 3: return [2];
                 }
             });
         }); };
         this.unstakeInstant = function (rewardSymbol, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, unstakeInstantInstruction, err_14;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, unstakeInstantInstruction, err_16;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4688,9 +4946,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeInstantInstruction);
                         return [3, 4];
                     case 3:
-                        err_14 = _a.sent();
-                        console.log("perpClient unstakeInstant error:: ", err_14);
-                        throw err_14;
+                        err_16 = _a.sent();
+                        console.log("perpClient unstakeInstant error:: ", err_16);
+                        throw err_16;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4699,7 +4957,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setFeeShareBps = function (poolConfig, flpStakeAccountPks) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, pool, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_2, flpStakeAccountPk, refreshStakeInstruction, err_15;
+            var publicKey, pool, custodyAccountMetas, _i, _a, custody, maxFlpStakeAccountPkLength, flpStakeAccountMetas, _b, flpStakeAccountPks_2, flpStakeAccountPk, refreshStakeInstruction, err_17;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -4743,15 +5001,15 @@ var PerpetualsClient = (function () {
                         refreshStakeInstruction = _c.sent();
                         return [2, refreshStakeInstruction];
                     case 2:
-                        err_15 = _c.sent();
-                        console.log("perpClient refreshStaking error:: ", err_15);
-                        throw err_15;
+                        err_17 = _c.sent();
+                        console.log("perpClient refreshStaking error:: ", err_17);
+                        throw err_17;
                     case 3: return [2];
                 }
             });
         }); };
         this.unstakeRequest = function (unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_16;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, unstakeRequestInstruction, err_18;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4785,9 +5043,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_16 = _a.sent();
-                        console.log("perpClient unstakeRequest error:: ", err_16);
-                        throw err_16;
+                        err_18 = _a.sent();
+                        console.log("perpClient unstakeRequest error:: ", err_18);
+                        throw err_18;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -4800,7 +5058,7 @@ var PerpetualsClient = (function () {
             if (deactivated === void 0) { deactivated = true; }
             if (createUserLPTA === void 0) { createUserLPTA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_17;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_19;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -4851,9 +5109,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_17 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_17);
-                            throw err_17;
+                            err_19 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_19);
+                            throw err_19;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4865,7 +5123,7 @@ var PerpetualsClient = (function () {
         this.collectStakeFees = function (rewardSymbol, poolConfig, nftTradingAccount, nftBoostingAccount, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, boostingAccount, withdrawStakeInstruction, err_18;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, boostingAccount, withdrawStakeInstruction, err_20;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -4932,9 +5190,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_18 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_18);
-                            throw err_18;
+                            err_20 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_20);
+                            throw err_20;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -4944,7 +5202,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_19;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, nftTransferAuthority, initRewardVault, err_21;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4981,9 +5239,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_19 = _a.sent();
-                        console.log("perpClient InitRewardVault error:: ", err_19);
-                        throw err_19;
+                        err_21 = _a.sent();
+                        console.log("perpClient InitRewardVault error:: ", err_21);
+                        throw err_21;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -4992,7 +5250,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_20;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_22;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5023,9 +5281,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 4];
                     case 3:
-                        err_20 = _a.sent();
-                        console.log("perpClient distributeReward error:: ", err_20);
-                        throw err_20;
+                        err_22 = _a.sent();
+                        console.log("perpClient distributeReward error:: ", err_22);
+                        throw err_22;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5036,7 +5294,7 @@ var PerpetualsClient = (function () {
         this.collectNftReward = function (rewardSymbol, poolConfig, nftMint, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, rewardCustodyMint, instructions, additionalSigners, nftTokenAccount, metadataAccount, receivingTokenAccount, _a, rewardRecord, rewardVault, rewardTokenAccount, nftTransferAuthority, collectNftReward, err_21;
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, nftTokenAccount, metadataAccount, receivingTokenAccount, _a, rewardRecord, rewardVault, rewardTokenAccount, nftTransferAuthority, collectNftReward, err_23;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5086,8 +5344,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectNftReward);
                             return [3, 6];
                         case 5:
-                            err_21 = _b.sent();
-                            throw err_21;
+                            err_23 = _b.sent();
+                            throw err_23;
                         case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners
@@ -5099,7 +5357,7 @@ var PerpetualsClient = (function () {
         this.collectAndDistributeFee = function (rewardSymbol, poolConfig, createUserATA, nftTradingAccount) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, rewardVault, rewardTokenAccount, withdrawStakeInstruction, err_22;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, rewardVault, rewardTokenAccount, withdrawStakeInstruction, err_24;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5163,9 +5421,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_22 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_22);
-                            throw err_22;
+                            err_24 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_24);
+                            throw err_24;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5175,7 +5433,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_23;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, positionAccount, instructions, additionalSigners, setTriggerPrice, err_25;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5214,9 +5472,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTriggerPrice);
                         return [3, 4];
                     case 3:
-                        err_23 = _a.sent();
-                        console.log("perpClient setTriggerPrice error:: ", err_23);
-                        throw err_23;
+                        err_25 = _a.sent();
+                        console.log("perpClient setTriggerPrice error:: ", err_25);
+                        throw err_25;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5229,7 +5487,7 @@ var PerpetualsClient = (function () {
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, forceClosePosition, closeWsolATAIns, err_24;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, forceClosePosition, closeWsolATAIns, err_26;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5290,9 +5548,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 7];
                         case 6:
-                            err_24 = _b.sent();
-                            console.log("perpClient forceClosePosition error:: ", err_24);
-                            throw err_24;
+                            err_26 = _b.sent();
+                            console.log("perpClient forceClosePosition error:: ", err_26);
+                            throw err_26;
                         case 7: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5305,7 +5563,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_25;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_27;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -5409,9 +5667,9 @@ var PerpetualsClient = (function () {
                             instructions.push(placeLimitOrder);
                             return [3, 11];
                         case 10:
-                            err_25 = _c.sent();
-                            console.log("perpClient placeLimitOrder error:: ", err_25);
-                            throw err_25;
+                            err_27 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_27);
+                            throw err_27;
                         case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5420,11 +5678,11 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.editLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey) {
+        this.editLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, receiveCustodyId, poolConfig, createUserATA, ephemeralSignerPubkey) {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_26;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_28;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5440,7 +5698,7 @@ var PerpetualsClient = (function () {
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 7, , 8]);
-                            if (!(collateralSymbol == 'SOL')) return [3, 2];
+                            if (!(reserveSymbol == 'SOL')) return [3, 2];
                             lamports = (this.minimumBalanceForRentExemptAccountLamports);
                             if (!ephemeralSignerPubkey) {
                                 wrappedSolAccount = new web3_js_1.Keypair();
@@ -5461,7 +5719,7 @@ var PerpetualsClient = (function () {
                             ];
                             return [3, 5];
                         case 2:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, publicKey, true);
                             _a = createUserATA;
                             if (!_a) return [3, 4];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
@@ -5470,7 +5728,7 @@ var PerpetualsClient = (function () {
                             _b.label = 4;
                         case 4:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(reserveSymbol).mintKey));
                             }
                             _b.label = 5;
                         case 5:
@@ -5482,7 +5740,8 @@ var PerpetualsClient = (function () {
                                     limitPrice: limitPrice,
                                     sizeAmount: sizeAmount,
                                     stopLossPrice: stopLossPrice,
-                                    takeProfitPrice: takeProfitPrice
+                                    takeProfitPrice: takeProfitPrice,
+                                    receiveCustodyId: receiveCustodyId
                                 })
                                     .accounts({
                                     owner: publicKey,
@@ -5498,7 +5757,7 @@ var PerpetualsClient = (function () {
                                     reserveCustody: reserveCustodyConfig.custodyAccount,
                                     reserveOracleAccount: this.useExtOracleAccount ? reserveCustodyConfig.extOracleAccount : reserveCustodyConfig.intOracleAccount,
                                     reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
-                                    receivingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
+                                    receivingAccount: reserveSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
@@ -5510,9 +5769,9 @@ var PerpetualsClient = (function () {
                             instructions.push(editLimitOrder);
                             return [3, 8];
                         case 7:
-                            err_26 = _b.sent();
-                            console.log("perpClient editLimitOrder error:: ", err_26);
-                            throw err_26;
+                            err_28 = _b.sent();
+                            console.log("perpClient editLimitOrder error:: ", err_28);
+                            throw err_28;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5526,7 +5785,7 @@ var PerpetualsClient = (function () {
             if (nftReferralAccount === void 0) { nftReferralAccount = web3_js_1.PublicKey.default; }
             if (nftRebateTokenAccount === void 0) { nftRebateTokenAccount = web3_js_1.PublicKey.default; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_27;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_29;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -5572,9 +5831,89 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitOrder);
                             return [3, 4];
                         case 3:
-                            err_27 = _a.sent();
-                            console.log("perpClient executeLimitOrder error:: ", err_27);
-                            throw err_27;
+                            err_29 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_29);
+                            throw err_29;
+                        case 4: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
+        this.executeLimitWithSwap = function (userPubkey, targetSymbol, collateralSymbol, reserveSymbol, side, orderId, poolConfig, privilege, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount) {
+            if (nftTradingAccount === void 0) { nftTradingAccount = web3_js_1.PublicKey.default; }
+            if (nftReferralAccount === void 0) { nftReferralAccount = web3_js_1.PublicKey.default; }
+            if (nftRebateTokenAccount === void 0) { nftRebateTokenAccount = web3_js_1.PublicKey.default; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody, positionAccount, orderAccount, executeLimitWithSwap, err_30;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            reserveCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey); });
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            custodyAccountMetas = [];
+                            custodyOracleAccountMetas = [];
+                            for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                                custody = _a[_i];
+                                custodyAccountMetas.push({
+                                    pubkey: custody.custodyAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyOracleAccountMetas.push({
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 3, , 4]);
+                            positionAccount = poolConfig.getPositionFromMarketPk(userPubkey, marketAccount);
+                            orderAccount = poolConfig.getOrderFromMarketPk(userPubkey, marketAccount);
+                            return [4, this.program.methods
+                                    .executeLimitWithSwap({
+                                    orderId: orderId,
+                                    privilege: privilege
+                                })
+                                    .accounts({
+                                    feePayer: publicKey,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    reserveCustody: reserveCustodyConfig.custodyAccount,
+                                    reserveCustodyOracleAccount: this.useExtOracleAccount ? reserveCustodyConfig.extOracleAccount : reserveCustodyConfig.intOracleAccount,
+                                    position: positionAccount,
+                                    order: orderAccount,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                    systemProgram: web3_js_1.SystemProgram.programId,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true), custodyAccountMetas, true), custodyOracleAccountMetas, true))
+                                    .instruction()];
+                        case 2:
+                            executeLimitWithSwap = _b.sent();
+                            instructions.push(executeLimitWithSwap);
+                            return [3, 4];
+                        case 3:
+                            err_30 = _b.sent();
+                            console.log("perpClient executeLimitWithSwap error:: ", err_30);
+                            throw err_30;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5584,7 +5923,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.placeTriggerOrder = function (targetSymbol, collateralSymbol, side, triggerPrice, deltaSizeAmount, isStopLoss, receiveCustodyId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_28;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_31;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5631,9 +5970,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_28 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_28);
-                        throw err_28;
+                        err_31 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_31);
+                        throw err_31;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5642,7 +5981,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.editTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_29;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_32;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5687,9 +6026,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_29 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_29);
-                        throw err_29;
+                        err_32 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_32);
+                        throw err_32;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5698,7 +6037,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_30;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_33;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5731,9 +6070,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_30 = _a.sent();
-                        console.log("perpClient cancelTriggerOrder error:: ", err_30);
-                        throw err_30;
+                        err_33 = _a.sent();
+                        console.log("perpClient cancelTriggerOrder error:: ", err_33);
+                        throw err_33;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5741,11 +6080,121 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
+        this.executeTriggerWithSwap = function (owner, targetSymbol, collateralSymbol, receivingSymbol, side, orderId, isStopLoss, poolConfig, createUserATA, ephemeralSignerPubkey) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, executeTriggerWithSwap, err_34;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            payerPubkey = this.provider.wallet.publicKey;
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            receivingCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receivingSymbol).mintKey); });
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            _d.label = 1;
+                        case 1:
+                            _d.trys.push([1, 9, , 10]);
+                            if (!false) return [3, 2];
+                            return [3, 7];
+                        case 2:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(receivingSymbol).mintKey, owner, true);
+                            _a = createUserATA;
+                            if (!_a) return [3, 4];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
+                            _a = !(_d.sent());
+                            _d.label = 4;
+                        case 4:
+                            if (_a) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, owner, poolConfig.getTokenFromSymbol(receivingSymbol).mintKey));
+                            }
+                            userReceivingTokenAccountCollateral = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, owner, true);
+                            _b = createUserATA;
+                            if (!_b) return [3, 6];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccountCollateral, this.provider.connection)];
+                        case 5:
+                            _b = !(_d.sent());
+                            _d.label = 6;
+                        case 6:
+                            if (_b) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccountCollateral, owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                            }
+                            _d.label = 7;
+                        case 7:
+                            positionAccount = poolConfig.getPositionFromMarketPk(owner, marketAccount);
+                            orderAccount = poolConfig.getOrderFromMarketPk(owner, marketAccount);
+                            custodyAccountMetas = [];
+                            custodyOracleAccountMetas = [];
+                            for (_i = 0, _c = poolConfig.custodies; _i < _c.length; _i++) {
+                                custody = _c[_i];
+                                custodyAccountMetas.push({
+                                    pubkey: custody.custodyAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyOracleAccountMetas.push({
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            return [4, this.program.methods
+                                    .executeTriggerWithSwap({
+                                    isStopLoss: isStopLoss,
+                                    orderId: orderId
+                                })
+                                    .accounts({
+                                    feePayer: payerPubkey,
+                                    receivingAccount: userReceivingTokenAccount,
+                                    collateralAccount: userReceivingTokenAccountCollateral,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionAccount,
+                                    order: orderAccount,
+                                    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,
+                                    dispensingCustody: receivingCustodyConfig.custodyAccount,
+                                    dispensingOracleAccount: this.useExtOracleAccount ? receivingCustodyConfig.extOracleAccount : receivingCustodyConfig.intOracleAccount,
+                                    dispensingCustodyTokenAccount: receivingCustodyConfig.tokenAccount,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
+                                    .instruction()];
+                        case 8:
+                            executeTriggerWithSwap = _d.sent();
+                            instructions.push(executeTriggerWithSwap);
+                            return [3, 10];
+                        case 9:
+                            err_34 = _d.sent();
+                            console.log("perpClient executeTriggerWithSwap error:: ", err_34);
+                            throw err_34;
+                        case 10: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
         this.executeTriggerOrder = function (owner, targetSymbol, collateralSymbol, side, orderId, isStopLoss, poolConfig, createUserATA, ephemeralSignerPubkey) {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_31;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_35;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5808,9 +6257,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerOrder);
                             return [3, 8];
                         case 7:
-                            err_31 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_31);
-                            throw err_31;
+                            err_35 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_35);
+                            throw err_35;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5819,15 +6268,12 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.migrateTriggerOrder = function (owner, targetSymbol, collateralSymbol, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_32;
+        this.migrateTriggerOrder = function (owner, marketAccount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var payerPubkey, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_36;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         payerPubkey = this.provider.wallet.publicKey;
-                        targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
-                        collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                        marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                         preInstructions = [];
                         instructions = [];
                         postInstructions = [];
@@ -5853,9 +6299,9 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_32 = _a.sent();
-                        console.log("perpClient migrateTriggerOrder error:: ", err_32);
-                        throw err_32;
+                        err_36 = _a.sent();
+                        console.log("perpClient migrateTriggerOrder error:: ", err_36);
+                        throw err_36;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5864,7 +6310,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.getPositionData = function (position, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_33;
+            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_37;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5893,15 +6339,15 @@ var PerpetualsClient = (function () {
                         console.log(getPositionData);
                         return [2, getPositionData];
                     case 3:
-                        err_33 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_33);
-                        throw err_33;
+                        err_37 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_37);
+                        throw err_37;
                     case 4: return [2];
                 }
             });
         }); };
         this.protocolWithdrawFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_34;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_38;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5934,9 +6380,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_34 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_34);
-                        throw err_34;
+                        err_38 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_38);
+                        throw err_38;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5945,7 +6391,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_35;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_39;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5972,9 +6418,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_35 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_35);
-                        throw err_35;
+                        err_39 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_39);
+                        throw err_39;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5983,7 +6429,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.reimburse = function (tokenMint, amountIn, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_36;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_40;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -6043,9 +6489,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_36 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_36);
-                        throw err_36;
+                        err_40 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_40);
+                        throw err_40;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6054,7 +6500,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalOraclePrice = function (tokenMint, price, expo, conf, ema, publishTime, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_37;
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_41;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6087,9 +6533,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_37 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_37);
-                        throw err_37;
+                        err_41 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_41);
+                        throw err_41;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6101,7 +6547,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, addCompoundingLiquidity, err_38;
+                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, addCompoundingLiquidity, err_42;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6224,8 +6670,8 @@ var PerpetualsClient = (function () {
                             instructions.push(addCompoundingLiquidity);
                             return [3, 10];
                         case 9:
-                            err_38 = _e.sent();
-                            console.log("perpClient addCompoundingLiquidity error:: ", err_38);
+                            err_42 = _e.sent();
+                            console.log("perpClient addCompoundingLiquidity error:: ", err_42);
                             return [3, 10];
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6239,7 +6685,7 @@ var PerpetualsClient = (function () {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, compoundingTokenAccount, removeCompoundingLiquidity, err_39;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, compoundingTokenAccount, removeCompoundingLiquidity, err_43;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6346,8 +6792,8 @@ var PerpetualsClient = (function () {
                             instructions.push(removeCompoundingLiquidity);
                             return [3, 8];
                         case 7:
-                            err_39 = _e.sent();
-                            console.log("perpClient removeCompoundingLiquidity error:: ", err_39);
+                            err_43 = _e.sent();
+                            console.log("perpClient removeCompoundingLiquidity error:: ", err_43);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6360,7 +6806,7 @@ var PerpetualsClient = (function () {
         this.migrateStake = function (amount, rewardTokenMint, poolConfig, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, migrateStake, err_40;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, migrateStake, err_44;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6441,8 +6887,8 @@ var PerpetualsClient = (function () {
                             instructions.push(migrateStake);
                             return [3, 6];
                         case 5:
-                            err_40 = _e.sent();
-                            console.log("perpClient migrateStake error:: ", err_40);
+                            err_44 = _e.sent();
+                            console.log("perpClient migrateStake error:: ", err_44);
                             return [3, 6];
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6453,7 +6899,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_41;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_45;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -6525,8 +6971,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_41 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_41);
+                        err_45 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_45);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6538,7 +6984,7 @@ var PerpetualsClient = (function () {
         this.compoundingFee = function (poolConfig, rewardTokenSymbol) {
             if (rewardTokenSymbol === void 0) { rewardTokenSymbol = 'USDC'; }
             return __awaiter(_this, void 0, void 0, function () {
-                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, compoundingFee, err_42;
+                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, compoundingFee, err_46;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -6595,8 +7041,8 @@ var PerpetualsClient = (function () {
                             instructions.push(compoundingFee);
                             return [3, 4];
                         case 3:
-                            err_42 = _d.sent();
-                            console.log("perpClient compoundingFee error:: ", err_42);
+                            err_46 = _d.sent();
+                            console.log("perpClient compoundingFee error:: ", err_46);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -6607,7 +7053,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.renameFlp = function (flag, lpTokenName, lpTokenSymbol, lpTokenUri, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_43;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_47;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6645,8 +7091,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_43 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_43);
+                        err_47 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_47);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -6656,7 +7102,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRewardDistribution = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, transferAuthority, initRewardVault, err_44;
+            var publicKey, rewardMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, transferAuthority, initRewardVault, err_48;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6690,9 +7136,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_44 = _a.sent();
-                        console.log("rewardDistribution InitRewardVault error:: ", err_44);
-                        throw err_44;
+                        err_48 = _a.sent();
+                        console.log("rewardDistribution InitRewardVault error:: ", err_48);
+                        throw err_48;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6701,7 +7147,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.updateCounterReward = function () { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_45;
+            var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_49;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6724,9 +7170,9 @@ var PerpetualsClient = (function () {
                         instructions.push(updateCounter);
                         return [3, 4];
                     case 3:
-                        err_45 = _a.sent();
-                        console.log("rewardDistribution updateCounter error:: ", err_45);
-                        throw err_45;
+                        err_49 = _a.sent();
+                        console.log("rewardDistribution updateCounter error:: ", err_49);
+                        throw err_49;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6735,7 +7181,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.rewardDistribution = function (counter, owner, rewardAmount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, rewardRecord, distributeReward, err_46;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, rewardRecord, distributeReward, err_50;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6774,9 +7220,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 4];
                     case 3:
-                        err_46 = _a.sent();
-                        console.log("rewardDistribution distributeReward error:: ", err_46);
-                        throw err_46;
+                        err_50 = _a.sent();
+                        console.log("rewardDistribution distributeReward error:: ", err_50);
+                        throw err_50;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6787,7 +7233,7 @@ var PerpetualsClient = (function () {
         this.collectReward = function (counter, owner, rewardSymbol, poolConfig, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, rewardCustodyMint, instructions, additionalSigners, receivingTokenAccount, _a, rewardVault, rewardTokenAccount, rewardRecord, transferAuthority, collectRaffleReward, err_47;
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, receivingTokenAccount, _a, rewardVault, rewardTokenAccount, rewardRecord, transferAuthority, collectRaffleReward, err_51;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6835,8 +7281,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectRaffleReward);
                             return [3, 6];
                         case 5:
-                            err_47 = _b.sent();
-                            throw err_47;
+                            err_51 = _b.sent();
+                            throw err_51;
                         case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners