flash-sdk 2.34.0 → 2.40.2

package/dist/PerpetualsClient.js

@@ -2567,45 +2567,6 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.getPositionQuoteView = function (targetSymbol, collateralSymbol, receivingSymbol, side, poolConfig, amountIn, leverage, discountIndex, privilege) { return __awaiter(_this, void 0, void 0, function () {
-            var targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, params;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        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);
-                        params = {
-                            amountIn: amountIn,
-                            leverage: leverage,
-                            privilege: privilege,
-                            discountIndex: discountIndex,
-                        };
-                        return [4, this.program.methods
-                                .getPositionQuote(params)
-                                .accounts({
-                                perpetuals: this.perpetuals.publicKey,
-                                pool: poolConfig.poolAddress,
-                                market: marketAccount,
-                                targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
-                                collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
-                                receivingCustody: receivingCustodyConfig.custodyAccount,
-                                receivingCustodyOracleAccount: this.useExtOracleAccount ? receivingCustodyConfig.extOracleAccount : receivingCustodyConfig.intOracleAccount,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                            })
-                                .remainingAccounts([])
-                                .view()
-                                .catch(function (err) {
-                                console.error(err);
-                                throw err;
-                            })];
-                    case 1: return [2, _a.sent()];
-                }
-            });
-        }); };
         this.openPosition = function (targetSymbol, collateralSymbol, priceWithSlippage, collateralWithfee, size, 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; }
@@ -4295,7 +4256,7 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.addReferral = function (nftTradingAccount, nftReferralAccount) { return __awaiter(_this, void 0, void 0, function () {
+        this.addReferral = function (tokenStakeAccount, nftReferralAccount) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addReferralInstruction, err_8;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -4314,7 +4275,7 @@ var PerpetualsClient = (function () {
                                 owner: publicKey,
                                 feePayer: publicKey,
                                 referralAccount: nftReferralAccount,
-                                tradingAccount: nftTradingAccount,
+                                tokenStakeAccount: tokenStakeAccount,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                             })
                                 .instruction()];
@@ -5029,8 +4990,512 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.initTokenVault = function (token_permissions, tokens_to_distribute, withdrawTimeLimit, withdrawInstantFee, stakeLevel, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_21;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        tokenMint = poolConfig.tokenMint;
+                        fundingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMint, publicKey, true);
+                        return [4, this.program.methods
+                                .initTokenVault({
+                                tokenPermissions: token_permissions,
+                                amount: tokens_to_distribute,
+                                withdrawTimeLimit: withdrawTimeLimit,
+                                withdrawInstantFee: withdrawInstantFee,
+                                stakeLevel: stakeLevel,
+                            })
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                transferAuthority: poolConfig.transferAuthority,
+                                fundingTokenAccount: fundingTokenAccount,
+                                tokenMint: tokenMint,
+                                tokenVault: poolConfig.tokenVault,
+                                tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        initTokenVaultInstruction = _a.sent();
+                        instructions.push(initTokenVaultInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_21 = _a.sent();
+                        console.log("perpClient InitTokenVaultInstruction error:: ", err_21);
+                        throw err_21;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setTokenVaultConfig = function (token_permissions, withdrawTimeLimit, withdrawInstantFee, stakeLevel, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_22;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .setTokenVaultConfig({
+                                tokenPermissions: token_permissions,
+                                withdrawTimeLimit: withdrawTimeLimit,
+                                withdrawInstantFee: withdrawInstantFee,
+                                stakeLevel: stakeLevel,
+                            })
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                tokenVault: poolConfig.tokenVault,
+                            })
+                                .instruction()];
+                    case 2:
+                        setTokenVaultConfigInstruction = _a.sent();
+                        instructions.push(setTokenVaultConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_22 = _a.sent();
+                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_22);
+                        throw err_22;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.withdrawInstantFee = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_23;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 5, , 6]);
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.tokenMint, publicKey, true)];
+                    case 2:
+                        receivingTokenAccount = _a.sent();
+                        return [4, (0, utils_1.checkIfAccountExists)(receivingTokenAccount, this.provider.connection)];
+                    case 3:
+                        if (!(_a.sent())) {
+                            throw "userTokenAccount doesn't exist : ".concat(receivingTokenAccount.toBase58());
+                        }
+                        return [4, this.program.methods
+                                .withdrawInstantFees({})
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                transferAuthority: poolConfig.transferAuthority,
+                                tokenVault: poolConfig.tokenVault,
+                                tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
+                                receivingTokenAccount: receivingTokenAccount,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                            })
+                                .instruction()];
+                    case 4:
+                        withdrawInstantFeeInstruction = _a.sent();
+                        instructions.push(withdrawInstantFeeInstruction);
+                        return [3, 6];
+                    case 5:
+                        err_23 = _a.sent();
+                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_23);
+                        throw err_23;
+                    case 6: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.burnAndClaim = function (owner, nftMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var preInstructions, instructions, postInstructions, additionalSigners, userTokenAccount, nftTokenAccount, nftTradingAccount, metadataAccount, burnAndClaimInstruction, err_24;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 6, , 7]);
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.tokenMint, owner, true)];
+                    case 2:
+                        userTokenAccount = _a.sent();
+                        return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                    case 3:
+                        if (!(_a.sent())) {
+                            throw "userTokenAccount doesn't exist : ".concat(userTokenAccount.toBase58());
+                        }
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(nftMint, owner, true)];
+                    case 4:
+                        nftTokenAccount = _a.sent();
+                        nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
+                            Buffer.from("trading"),
+                            nftMint.toBuffer(),
+                        ], this.programId)[0];
+                        metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
+                        return [4, this.program.methods
+                                .burnAndClaim({})
+                                .accounts({
+                                owner: owner,
+                                receivingTokenAccount: userTokenAccount,
+                                perpetuals: this.perpetuals.publicKey,
+                                tokenVault: poolConfig.tokenVault,
+                                tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
+                                metadataAccount: metadataAccount,
+                                tradingAccount: nftTradingAccount,
+                                transferAuthority: poolConfig.transferAuthority,
+                                metadataProgram: constants_1.METAPLEX_PROGRAM_ID,
+                                nftMint: nftMint,
+                                nftTokenAccount: nftTokenAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId
+                            })
+                                .instruction()];
+                    case 5:
+                        burnAndClaimInstruction = _a.sent();
+                        instructions.push(burnAndClaimInstruction);
+                        return [3, 7];
+                    case 6:
+                        err_24 = _a.sent();
+                        console.log("perpClient burnAndClaimInstruction error:: ", err_24);
+                        throw err_24;
+                    case 7: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.burnAndStake = function (owner, feePayer, nftMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, nftTokenAccount, nftTradingAccount, metadataAccount, burnAndStakeInstruction, err_25;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(nftMint, owner, true)];
+                    case 2:
+                        nftTokenAccount = _a.sent();
+                        nftTradingAccount = web3_js_1.PublicKey.findProgramAddressSync([
+                            Buffer.from("trading"),
+                            nftMint.toBuffer(),
+                        ], this.programId)[0];
+                        metadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), nftMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
+                        return [4, this.program.methods
+                                .burnAndStake({})
+                                .accounts({
+                                owner: owner,
+                                feePayer: feePayer,
+                                perpetuals: this.perpetuals.publicKey,
+                                tokenVault: poolConfig.tokenVault,
+                                tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
+                                tokenStakeAccount: tokenStakeAccount,
+                                metadataAccount: metadataAccount,
+                                tradingAccount: nftTradingAccount,
+                                transferAuthority: poolConfig.transferAuthority,
+                                metadataProgram: constants_1.METAPLEX_PROGRAM_ID,
+                                nftMint: nftMint,
+                                nftTokenAccount: nftTokenAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId
+                            })
+                                .instruction()];
+                    case 3:
+                        burnAndStakeInstruction = _a.sent();
+                        instructions.push(burnAndStakeInstruction);
+                        return [3, 5];
+                    case 4:
+                        err_25 = _a.sent();
+                        console.log("perpClient burnAndStakeInstruction error:: ", err_25);
+                        throw err_25;
+                    case 5: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.depositTokenStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_26;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 5, , 6]);
+                        tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.tokenMint, owner, true)];
+                    case 2:
+                        userTokenAccount = _a.sent();
+                        return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                    case 3:
+                        if (!(_a.sent())) {
+                            throw "userTokenAccount doesn't exist : ".concat(userTokenAccount.toBase58());
+                        }
+                        return [4, this.program.methods
+                                .depositTokenStake({
+                                depositAmount: depositAmount
+                            })
+                                .accounts({
+                                owner: owner,
+                                feePayer: feePayer,
+                                fundingTokenAccount: userTokenAccount,
+                                perpetuals: this.perpetuals.publicKey,
+                                tokenVault: poolConfig.tokenVault,
+                                tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
+                                tokenStakeAccount: tokenStakeAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId
+                            })
+                                .instruction()];
+                    case 4:
+                        depositTokenStakeInstruction = _a.sent();
+                        instructions.push(depositTokenStakeInstruction);
+                        return [3, 6];
+                    case 5:
+                        err_26 = _a.sent();
+                        console.log("perpClient depositStakingInstruction error:: ", err_26);
+                        throw err_26;
+                    case 6: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.unstakeTokenRequest = function (owner, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_27;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
+                        return [4, this.program.methods
+                                .unstakeTokenRequest({
+                                unstakeAmount: unstakeAmount
+                            })
+                                .accounts({
+                                owner: owner,
+                                tokenVault: poolConfig.tokenVault,
+                                tokenStakeAccount: tokenStakeAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId
+                            })
+                                .instruction()];
+                    case 2:
+                        unstakeTokenRequestInstruction = _a.sent();
+                        instructions.push(unstakeTokenRequestInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_27 = _a.sent();
+                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_27);
+                        throw err_27;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.unstakeTokenInstant = function (owner, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, unstakeTokenInstantInstruction, err_28;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 5, , 6]);
+                        tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.tokenMint, owner, true)];
+                    case 2:
+                        userTokenAccount = _a.sent();
+                        return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                    case 3:
+                        if (!(_a.sent())) {
+                            throw "userTokenAccount doesn't exist : ".concat(userTokenAccount.toBase58());
+                        }
+                        return [4, this.program.methods
+                                .unstakeTokenInstant({
+                                unstakeAmount: unstakeAmount
+                            })
+                                .accounts({
+                                owner: owner,
+                                receivingTokenAccount: userTokenAccount,
+                                perpetuals: poolConfig.perpetuals,
+                                transferAuthority: poolConfig.transferAuthority,
+                                tokenVault: poolConfig.tokenVault,
+                                tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
+                                tokenStakeAccount: tokenStakeAccount,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId
+                            })
+                                .instruction()];
+                    case 4:
+                        unstakeTokenInstantInstruction = _a.sent();
+                        instructions.push(unstakeTokenInstantInstruction);
+                        return [3, 6];
+                    case 5:
+                        err_28 = _a.sent();
+                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_28);
+                        throw err_28;
+                    case 6: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.withdrawToken = function (owner, withdrawStakeId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_29;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 5, , 6]);
+                        tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.tokenMint, owner, true)];
+                    case 2:
+                        userTokenAccount = _a.sent();
+                        return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
+                    case 3:
+                        if (!(_a.sent())) {
+                            throw "userTokenAccount doesn't exist : ".concat(userTokenAccount.toBase58());
+                        }
+                        return [4, this.program.methods
+                                .withdrawToken({
+                                withdrawStakeId: withdrawStakeId
+                            })
+                                .accounts({
+                                owner: owner,
+                                receivingTokenAccount: userTokenAccount,
+                                perpetuals: this.perpetuals.publicKey,
+                                transferAuthority: poolConfig.transferAuthority,
+                                tokenVault: poolConfig.tokenVault,
+                                tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
+                                tokenStakeAccount: tokenStakeAccount,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId
+                            })
+                                .instruction()];
+                    case 4:
+                        withdrawTokenInstruction = _a.sent();
+                        instructions.push(withdrawTokenInstruction);
+                        return [3, 6];
+                    case 5:
+                        err_29 = _a.sent();
+                        console.log("perpClient withdrawTokenInstruction error:: ", err_29);
+                        throw err_29;
+                    case 6: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.cancelUnstakeRequest = function (owner, withdrawStakeId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeRequestInstruction, err_30;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), owner.toBuffer()], this.programId)[0];
+                        return [4, this.program.methods
+                                .cancelUnstakeTokenRequest({
+                                withdrawStakeId: withdrawStakeId
+                            })
+                                .accounts({
+                                owner: owner,
+                                tokenVault: poolConfig.tokenVault,
+                                tokenStakeAccount: tokenStakeAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId
+                            })
+                                .instruction()];
+                    case 2:
+                        cancelUnstakeRequestInstruction = _a.sent();
+                        instructions.push(cancelUnstakeRequestInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_30 = _a.sent();
+                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_30);
+                        throw err_30;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
         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_21;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, nftTransferAuthority, initRewardVault, err_31;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5067,9 +5532,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_21 = _a.sent();
-                        console.log("perpClient InitRewardVault error:: ", err_21);
-                        throw err_21;
+                        err_31 = _a.sent();
+                        console.log("perpClient InitRewardVault error:: ", err_31);
+                        throw err_31;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5078,7 +5543,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_22;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, distributeReward, err_32;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5109,9 +5574,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 4];
                     case 3:
-                        err_22 = _a.sent();
-                        console.log("perpClient distributeReward error:: ", err_22);
-                        throw err_22;
+                        err_32 = _a.sent();
+                        console.log("perpClient distributeReward error:: ", err_32);
+                        throw err_32;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5122,7 +5587,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_23;
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, nftTokenAccount, metadataAccount, receivingTokenAccount, _a, rewardRecord, rewardVault, rewardTokenAccount, nftTransferAuthority, collectNftReward, err_33;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5172,8 +5637,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectNftReward);
                             return [3, 6];
                         case 5:
-                            err_23 = _b.sent();
-                            throw err_23;
+                            err_33 = _b.sent();
+                            throw err_33;
                         case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners
@@ -5185,7 +5650,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_24;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, rewardVault, rewardTokenAccount, withdrawStakeInstruction, err_34;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5249,9 +5714,9 @@ var PerpetualsClient = (function () {
                             instructions.push(withdrawStakeInstruction);
                             return [3, 6];
                         case 5:
-                            err_24 = _b.sent();
-                            console.log("perpClient withdrawStake error:: ", err_24);
-                            throw err_24;
+                            err_34 = _b.sent();
+                            console.log("perpClient withdrawStake error:: ", err_34);
+                            throw err_34;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5261,7 +5726,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_25;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, positionAccount, instructions, additionalSigners, setTriggerPrice, err_35;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5300,9 +5765,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTriggerPrice);
                         return [3, 4];
                     case 3:
-                        err_25 = _a.sent();
-                        console.log("perpClient setTriggerPrice error:: ", err_25);
-                        throw err_25;
+                        err_35 = _a.sent();
+                        console.log("perpClient setTriggerPrice error:: ", err_35);
+                        throw err_35;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5315,7 +5780,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_26;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, forceClosePosition, closeWsolATAIns, err_36;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5376,9 +5841,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 7];
                         case 6:
-                            err_26 = _b.sent();
-                            console.log("perpClient forceClosePosition error:: ", err_26);
-                            throw err_26;
+                            err_36 = _b.sent();
+                            console.log("perpClient forceClosePosition error:: ", err_36);
+                            throw err_36;
                         case 7: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5391,7 +5856,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_27;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_37;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -5495,9 +5960,9 @@ var PerpetualsClient = (function () {
                             instructions.push(placeLimitOrder);
                             return [3, 11];
                         case 10:
-                            err_27 = _c.sent();
-                            console.log("perpClient placeLimitOrder error:: ", err_27);
-                            throw err_27;
+                            err_37 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_37);
+                            throw err_37;
                         case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5510,7 +5975,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, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_28;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_38;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5597,9 +6062,9 @@ var PerpetualsClient = (function () {
                             instructions.push(editLimitOrder);
                             return [3, 8];
                         case 7:
-                            err_28 = _b.sent();
-                            console.log("perpClient editLimitOrder error:: ", err_28);
-                            throw err_28;
+                            err_38 = _b.sent();
+                            console.log("perpClient editLimitOrder error:: ", err_38);
+                            throw err_38;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5613,7 +6078,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_29;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_39;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -5659,9 +6124,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitOrder);
                             return [3, 4];
                         case 3:
-                            err_29 = _a.sent();
-                            console.log("perpClient executeLimitOrder error:: ", err_29);
-                            throw err_29;
+                            err_39 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_39);
+                            throw err_39;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5675,7 +6140,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, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody, positionAccount, orderAccount, executeLimitWithSwap, err_30;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody, positionAccount, orderAccount, executeLimitWithSwap, err_40;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5739,9 +6204,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitWithSwap);
                             return [3, 4];
                         case 3:
-                            err_30 = _b.sent();
-                            console.log("perpClient executeLimitWithSwap error:: ", err_30);
-                            throw err_30;
+                            err_40 = _b.sent();
+                            console.log("perpClient executeLimitWithSwap error:: ", err_40);
+                            throw err_40;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5751,7 +6216,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_31;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_41;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5798,9 +6263,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_31 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_31);
-                        throw err_31;
+                        err_41 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_41);
+                        throw err_41;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5809,7 +6274,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_32;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_42;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5854,9 +6319,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_32 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_32);
-                        throw err_32;
+                        err_42 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_42);
+                        throw err_42;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5865,7 +6330,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_33;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_43;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5898,9 +6363,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_33 = _a.sent();
-                        console.log("perpClient cancelTriggerOrder error:: ", err_33);
-                        throw err_33;
+                        err_43 = _a.sent();
+                        console.log("perpClient cancelTriggerOrder error:: ", err_43);
+                        throw err_43;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5912,7 +6377,7 @@ var PerpetualsClient = (function () {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, executeTriggerWithSwap, err_34;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, executeTriggerWithSwap, err_44;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -6007,9 +6472,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerWithSwap);
                             return [3, 10];
                         case 9:
-                            err_34 = _d.sent();
-                            console.log("perpClient executeTriggerWithSwap error:: ", err_34);
-                            throw err_34;
+                            err_44 = _d.sent();
+                            console.log("perpClient executeTriggerWithSwap error:: ", err_44);
+                            throw err_44;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6022,7 +6487,7 @@ var PerpetualsClient = (function () {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_35;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_45;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6085,9 +6550,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerOrder);
                             return [3, 8];
                         case 7:
-                            err_35 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_35);
-                            throw err_35;
+                            err_45 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_45);
+                            throw err_45;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6097,7 +6562,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.migrateTriggerOrder = function (owner, marketAccount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var payerPubkey, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_36;
+            var payerPubkey, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_46;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6127,9 +6592,9 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_36 = _a.sent();
-                        console.log("perpClient migrateTriggerOrder error:: ", err_36);
-                        throw err_36;
+                        err_46 = _a.sent();
+                        console.log("perpClient migrateTriggerOrder error:: ", err_46);
+                        throw err_46;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6138,7 +6603,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.getPositionData = function (position, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_37;
+            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_47;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6167,15 +6632,15 @@ var PerpetualsClient = (function () {
                         console.log(getPositionData);
                         return [2, getPositionData];
                     case 3:
-                        err_37 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_37);
-                        throw err_37;
+                        err_47 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_47);
+                        throw err_47;
                     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_38;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_48;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6208,9 +6673,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_38 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_38);
-                        throw err_38;
+                        err_48 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_48);
+                        throw err_48;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6219,7 +6684,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_39;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_49;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6246,9 +6711,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_39 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_39);
-                        throw err_39;
+                        err_49 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_49);
+                        throw err_49;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6257,7 +6722,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_40;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_50;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -6317,9 +6782,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_40 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_40);
-                        throw err_40;
+                        err_50 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_50);
+                        throw err_50;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6328,7 +6793,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_41;
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_51;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6361,9 +6826,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_41 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_41);
-                        throw err_41;
+                        err_51 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_51);
+                        throw err_51;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6375,7 +6840,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_42;
+                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, addCompoundingLiquidity, err_52;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6498,8 +6963,8 @@ var PerpetualsClient = (function () {
                             instructions.push(addCompoundingLiquidity);
                             return [3, 10];
                         case 9:
-                            err_42 = _e.sent();
-                            console.log("perpClient addCompoundingLiquidity error:: ", err_42);
+                            err_52 = _e.sent();
+                            console.log("perpClient addCompoundingLiquidity error:: ", err_52);
                             return [3, 10];
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6513,7 +6978,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_43;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, compoundingTokenAccount, removeCompoundingLiquidity, err_53;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6620,8 +7085,8 @@ var PerpetualsClient = (function () {
                             instructions.push(removeCompoundingLiquidity);
                             return [3, 8];
                         case 7:
-                            err_43 = _e.sent();
-                            console.log("perpClient removeCompoundingLiquidity error:: ", err_43);
+                            err_53 = _e.sent();
+                            console.log("perpClient removeCompoundingLiquidity error:: ", err_53);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6634,7 +7099,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_44;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, migrateStake, err_54;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6715,8 +7180,8 @@ var PerpetualsClient = (function () {
                             instructions.push(migrateStake);
                             return [3, 6];
                         case 5:
-                            err_44 = _e.sent();
-                            console.log("perpClient migrateStake error:: ", err_44);
+                            err_54 = _e.sent();
+                            console.log("perpClient migrateStake error:: ", err_54);
                             return [3, 6];
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6727,7 +7192,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_45;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_55;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -6799,8 +7264,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_45 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_45);
+                        err_55 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_55);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6812,7 +7277,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_46;
+                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, compoundingFee, err_56;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -6869,8 +7334,8 @@ var PerpetualsClient = (function () {
                             instructions.push(compoundingFee);
                             return [3, 4];
                         case 3:
-                            err_46 = _d.sent();
-                            console.log("perpClient compoundingFee error:: ", err_46);
+                            err_56 = _d.sent();
+                            console.log("perpClient compoundingFee error:: ", err_56);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -6881,7 +7346,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_47;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_57;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6919,8 +7384,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_47 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_47);
+                        err_57 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_57);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),