flash-sdk 13.0.2 → 14.0.1

package/dist/PerpetualsClient.js

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -1913,7 +1913,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 2] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([POOL_CONFIG_1, userPublicKey_1], args_1, true), void 0, function (POOL_CONFIG, userPublicKey, enableDebuglogs) {
-                var fafTokenVaultPk, fafTokenVaultAccountInfo, fafTokenVaultAccount, fafTokenVault, tokenStakeAccount, accountInfo, fafStakeData, tokenStakeFafAccount, activeStakeAmount, revenuePerFafStaked, revenueWatermark, revenueSnapshot, unclaimedRevenue, revenueAmount;
+                var fafTokenVaultPk, fafTokenVaultAccountInfo, fafTokenVaultAccount, fafTokenVault, tokenStakeAccount, accountInfo, fafStakeData, tokenStakeFafAccount, eligibleAmount, revenuePerFafStaked, revenueWatermark, revenueSnapshot, unclaimedRevenue, revenueAmount;
                 var _a, _b, _c, _d;
                 if (enableDebuglogs === void 0) { enableDebuglogs = false; }
                 return __generator(this, function (_e) {
@@ -1942,9 +1942,9 @@ var PerpetualsClient = (function () {
                             if (accountInfo) {
                                 fafStakeData = this.program.coder.accounts.decode('tokenStake', accountInfo.data);
                                 tokenStakeFafAccount = TokenStakeAccount_1.TokenStakeAccount.from(fafStakeData);
-                                activeStakeAmount = (_a = tokenStakeFafAccount === null || tokenStakeFafAccount === void 0 ? void 0 : tokenStakeFafAccount.activeStakeAmount) !== null && _a !== void 0 ? _a : constants_1.BN_ZERO;
+                                eligibleAmount = (_a = tokenStakeFafAccount === null || tokenStakeFafAccount === void 0 ? void 0 : tokenStakeFafAccount.getRevenueEligibleAmount()) !== null && _a !== void 0 ? _a : constants_1.BN_ZERO;
                                 revenuePerFafStaked = (_b = fafTokenVaultAccount === null || fafTokenVaultAccount === void 0 ? void 0 : fafTokenVaultAccount.revenuePerFafStaked) !== null && _b !== void 0 ? _b : constants_1.BN_ZERO;
-                                revenueWatermark = activeStakeAmount
+                                revenueWatermark = eligibleAmount
                                     .mul(revenuePerFafStaked)
                                     .div(new anchor_1.BN(10).pow(new anchor_1.BN(constants_1.FAF_DECIMALS)));
                                 revenueSnapshot = (_c = tokenStakeFafAccount === null || tokenStakeFafAccount === void 0 ? void 0 : tokenStakeFafAccount.revenueSnapshot) !== null && _c !== void 0 ? _c : constants_1.BN_ZERO;
@@ -1963,6 +1963,43 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.getTokenStakeAccount = function (poolConfig, userPublicKey) { return __awaiter(_this, void 0, void 0, function () {
+            var tokenStakePk, accountInfo, decoded;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        tokenStakePk = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('token_stake'), userPublicKey.toBuffer()], poolConfig.programId)[0];
+                        return [4, this.provider.connection.getAccountInfo(tokenStakePk)];
+                    case 1:
+                        accountInfo = _a.sent();
+                        if (!accountInfo) {
+                            return [2, null];
+                        }
+                        decoded = this.program.coder.accounts.decode('tokenStake', accountInfo.data);
+                        return [2, TokenStakeAccount_1.TokenStakeAccount.from(decoded)];
+                }
+            });
+        }); };
+        this.getUserUnstakingStatus = function (poolConfig, userPublicKey) { return __awaiter(_this, void 0, void 0, function () {
+            var tokenStakeAccount;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.getTokenStakeAccount(poolConfig, userPublicKey)];
+                    case 1:
+                        tokenStakeAccount = _a.sent();
+                        if (!tokenStakeAccount) {
+                            return [2, null];
+                        }
+                        return [2, {
+                                activeStakeAmount: tokenStakeAccount.activeStakeAmount,
+                                totalLocked: tokenStakeAccount.getLockedAmount(),
+                                totalWithdrawable: tokenStakeAccount.getWithdrawableAmount(),
+                                revenueEligibleAmount: tokenStakeAccount.getRevenueEligibleAmount(),
+                                requests: tokenStakeAccount.getLockStatus(),
+                            }];
+                }
+            });
+        }); };
         this.getLpTokenPriceView = function (poolConfig_1) {
             var args_1 = [];
             for (var _i = 1; _i < arguments.length; _i++) {
@@ -5126,48 +5163,8 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.migrateTokenStake = function (tokenStakeAccounts) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, remainingAccounts, migrateTokenStakeIx, err_19;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        publicKey = this.provider.wallet.publicKey;
-                        instructions = [];
-                        additionalSigners = [];
-                        remainingAccounts = tokenStakeAccounts.map(function (pubkey) { return ({
-                            pubkey: pubkey,
-                            isSigner: false,
-                            isWritable: true,
-                        }); });
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4, this.program.methods
-                                .migrateTokenStake({})
-                                .accountsPartial({
-                                admin: publicKey,
-                                multisig: this.multisig.publicKey,
-                                program: this.program.programId,
-                            })
-                                .remainingAccounts(remainingAccounts)
-                                .instruction()];
-                    case 2:
-                        migrateTokenStakeIx = _a.sent();
-                        instructions.push(migrateTokenStakeIx);
-                        return [3, 4];
-                    case 3:
-                        err_19 = _a.sent();
-                        console.log("perpClient migrateTokenStake error:: ", err_19);
-                        return [3, 4];
-                    case 4: return [2, {
-                            instructions: instructions,
-                            additionalSigners: additionalSigners,
-                        }];
-                }
-            });
-        }); };
         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_20;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_19;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -5238,8 +5235,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_20 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_20);
+                        err_19 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_19);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5254,7 +5251,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 1] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([poolConfig_1], args_1, true), void 0, function (poolConfig, rewardTokenSymbol) {
-                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, compoundingFee, err_21;
+                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, compoundingFee, err_20;
                 if (rewardTokenSymbol === void 0) { rewardTokenSymbol = 'USDC'; }
                 return __generator(this, function (_e) {
                     switch (_e.label) {
@@ -5311,8 +5308,8 @@ var PerpetualsClient = (function () {
                             instructions.push(compoundingFee);
                             return [3, 4];
                         case 3:
-                            err_21 = _e.sent();
-                            console.log("perpClient compoundingFee error:: ", err_21);
+                            err_20 = _e.sent();
+                            console.log("perpClient compoundingFee error:: ", err_20);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -5323,7 +5320,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.depositTokenStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_22;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, depositTokenStakeInstruction, err_21;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5363,9 +5360,9 @@ var PerpetualsClient = (function () {
                         instructions.push(depositTokenStakeInstruction);
                         return [3, 5];
                     case 4:
-                        err_22 = _a.sent();
-                        console.log("perpClient depositStakingInstruction error:: ", err_22);
-                        throw err_22;
+                        err_21 = _a.sent();
+                        console.log("perpClient depositStakingInstruction error:: ", err_21);
+                        throw err_21;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5374,7 +5371,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.unstakeTokenRequest = function (owner, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_23;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, unstakeTokenRequestInstruction, err_22;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5402,9 +5399,9 @@ var PerpetualsClient = (function () {
                         instructions.push(unstakeTokenRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_23 = _a.sent();
-                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_23);
-                        throw err_23;
+                        err_22 = _a.sent();
+                        console.log("perpClient unstakeTokenRequestInstruction error:: ", err_22);
+                        throw err_22;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5412,58 +5409,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.unstakeTokenInstant = function (owner, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, unstakeTokenInstantInstruction, err_24;
-            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];
-                        userTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.tokenMint, owner, true);
-                        return [4, (0, utils_1.checkIfAccountExists)(userTokenAccount, this.provider.connection)];
-                    case 2:
-                        if (!(_a.sent())) {
-                            preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(this.provider.wallet.publicKey, userTokenAccount, owner, poolConfig.tokenMint));
-                        }
-                        return [4, this.program.methods
-                                .unstakeTokenInstant({
-                                unstakeAmount: unstakeAmount
-                            })
-                                .accountsPartial({
-                                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,
-                                tokenMint: poolConfig.tokenMint,
-                            })
-                                .instruction()];
-                    case 3:
-                        unstakeTokenInstantInstruction = _a.sent();
-                        instructions.push(unstakeTokenInstantInstruction);
-                        return [3, 5];
-                    case 4:
-                        err_24 = _a.sent();
-                        console.log("perpClient unstakeTokenInstantInstruction error:: ", err_24);
-                        throw err_24;
-                    case 5: return [2, {
-                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
         this.withdrawToken = function (owner, withdrawRequestId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_25;
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, withdrawTokenInstruction, err_23;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5483,7 +5430,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .withdrawToken({
-                                withdrawRequestId: withdrawRequestId
+                                withdrawRequestId: withdrawRequestId,
                             })
                                 .accountsPartial({
                                 owner: owner,
@@ -5502,9 +5449,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawTokenInstruction);
                         return [3, 5];
                     case 4:
-                        err_25 = _a.sent();
-                        console.log("perpClient withdrawTokenInstruction error:: ", err_25);
-                        throw err_25;
+                        err_23 = _a.sent();
+                        console.log("perpClient withdrawTokenInstruction error:: ", err_23);
+                        throw err_23;
                     case 5: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5512,8 +5459,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.cancelUnstakeRequest = function (owner, withdrawRequestId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeRequestInstruction, err_26;
+        this.cancelUnstakeTokenRequest = function (owner, withdrawRequestId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, cancelUnstakeTokenRequestInstruction, err_24;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5537,13 +5484,13 @@ var PerpetualsClient = (function () {
                             })
                                 .instruction()];
                     case 2:
-                        cancelUnstakeRequestInstruction = _a.sent();
-                        instructions.push(cancelUnstakeRequestInstruction);
+                        cancelUnstakeTokenRequestInstruction = _a.sent();
+                        instructions.push(cancelUnstakeTokenRequestInstruction);
                         return [3, 4];
                     case 3:
-                        err_26 = _a.sent();
-                        console.log("perpClient cancelUnstakeRequestInstruction error:: ", err_26);
-                        throw err_26;
+                        err_24 = _a.sent();
+                        console.log("perpClient cancelUnstakeTokenRequestInstruction error:: ", err_24);
+                        throw err_24;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5557,7 +5504,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 2] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, poolConfig_1], args_1, true), void 0, function (owner, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, _a, collectTokenRewardInstruction, err_27;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, userTokenAccount, _a, collectTokenRewardInstruction, err_25;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -5601,9 +5548,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectTokenRewardInstruction);
                             return [3, 6];
                         case 5:
-                            err_27 = _b.sent();
-                            console.log("perpClient collectTokenRewardInstruction error:: ", err_27);
-                            throw err_27;
+                            err_25 = _b.sent();
+                            console.log("perpClient collectTokenRewardInstruction error:: ", err_25);
+                            throw err_25;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5618,7 +5565,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, rewardSymbol_1, poolConfig_1], args_1, true), void 0, function (owner, rewardSymbol, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_28;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, tokenStakeAccount, userTokenAccount, _a, collectRevenueInstruction, err_26;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -5663,9 +5610,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectRevenueInstruction);
                             return [3, 6];
                         case 5:
-                            err_28 = _b.sent();
-                            console.log("perpClient collectRevenueInstruction error:: ", err_28);
-                            throw err_28;
+                            err_26 = _b.sent();
+                            console.log("perpClient collectRevenueInstruction error:: ", err_26);
+                            throw err_26;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5674,13 +5621,52 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.refreshTokenStake = function (tokenStakeAccounts, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var instructions, additionalSigners, remainingAccounts, refreshTokenStakeInstruction, err_27;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        instructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        remainingAccounts = tokenStakeAccounts.map(function (pubkey) { return ({
+                            pubkey: pubkey,
+                            isSigner: false,
+                            isWritable: true,
+                        }); });
+                        return [4, this.program.methods
+                                .refreshTokenStake({})
+                                .accountsPartial({
+                                perpetuals: this.perpetuals.publicKey,
+                                tokenVault: poolConfig.tokenVault,
+                                program: this.programId,
+                            })
+                                .remainingAccounts(remainingAccounts)
+                                .instruction()];
+                    case 2:
+                        refreshTokenStakeInstruction = _a.sent();
+                        instructions.push(refreshTokenStakeInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_27 = _a.sent();
+                        console.log("perpClient refreshTokenStakeInstruction error:: ", err_27);
+                        throw err_27;
+                    case 4: return [2, {
+                            instructions: instructions,
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
         this.collectRebate = function (owner_1, rebateSymbol_1, poolConfig_1) {
             var args_1 = [];
             for (var _i = 3; _i < arguments.length; _i++) {
                 args_1[_i - 3] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, rebateSymbol_1, poolConfig_1], args_1, true), void 0, function (owner, rebateSymbol, poolConfig, createUserATA) {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateMint, tokenStakeAccount, userTokenAccount, _a, collectRebateInstruction, err_29;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateMint, tokenStakeAccount, userTokenAccount, _a, collectRebateInstruction, err_28;
                 if (createUserATA === void 0) { createUserATA = true; }
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -5725,9 +5711,9 @@ var PerpetualsClient = (function () {
                             instructions.push(collectRebateInstruction);
                             return [3, 6];
                         case 5:
-                            err_29 = _b.sent();
-                            console.log("perpClient collectRebateInstruction error:: ", err_29);
-                            throw err_29;
+                            err_28 = _b.sent();
+                            console.log("perpClient collectRebateInstruction error:: ", err_28);
+                            throw err_28;
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5737,7 +5723,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.settleRebates = function (rebateSymbol, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, rebateMint, settleRebatesInstruction, err_30;
+            var preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, rebateMint, settleRebatesInstruction, err_29;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5771,9 +5757,9 @@ var PerpetualsClient = (function () {
                         instructions.push(settleRebatesInstruction);
                         return [3, 4];
                     case 3:
-                        err_30 = _a.sent();
-                        console.log("perpClient settleRebatesInstruction error:: ", err_30);
-                        throw err_30;
+                        err_29 = _a.sent();
+                        console.log("perpClient settleRebatesInstruction error:: ", err_29);
+                        throw err_29;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5787,7 +5773,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 11] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, limitPrice_1, reserveAmount_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, limitPrice, reserveAmount, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_31;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_30;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_c) {
@@ -5891,9 +5877,9 @@ var PerpetualsClient = (function () {
                             instructions.push(placeLimitOrder);
                             return [3, 10];
                         case 9:
-                            err_31 = _c.sent();
-                            console.log("perpClient placeLimitOrder error:: ", err_31);
-                            throw err_31;
+                            err_30 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_30);
+                            throw err_30;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5908,7 +5894,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 11] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([targetSymbol_1, collateralSymbol_1, reserveSymbol_1, receiveSymbol_1, side_1, orderId_1, limitPrice_1, sizeAmount_1, stopLossPrice_1, takeProfitPrice_1, poolConfig_1], args_1, true), void 0, function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey) {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_32;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_31;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 return __generator(this, function (_b) {
@@ -5997,9 +5983,9 @@ var PerpetualsClient = (function () {
                             instructions.push(editLimitOrder);
                             return [3, 8];
                         case 7:
-                            err_32 = _b.sent();
-                            console.log("perpClient editLimitOrder error:: ", err_32);
-                            throw err_32;
+                            err_31 = _b.sent();
+                            console.log("perpClient editLimitOrder error:: ", err_31);
+                            throw err_31;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6014,7 +6000,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 7] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([userPubkey_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, poolConfig_1, privilege_1], args_1, true), void 0, function (userPubkey, targetSymbol, collateralSymbol, side, orderId, poolConfig, privilege, tokenStakeAccount, userReferralAccount) {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_33;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_32;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
                 return __generator(this, function (_a) {
@@ -6064,9 +6050,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitOrder);
                             return [3, 4];
                         case 3:
-                            err_33 = _a.sent();
-                            console.log("perpClient executeLimitOrder error:: ", err_33);
-                            throw err_33;
+                            err_32 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_32);
+                            throw err_32;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6081,7 +6067,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 8] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([userPubkey_1, targetSymbol_1, collateralSymbol_1, reserveSymbol_1, side_1, orderId_1, poolConfig_1, privilege_1], args_1, true), void 0, function (userPubkey, targetSymbol, collateralSymbol, reserveSymbol, side, orderId, poolConfig, privilege, tokenStakeAccount, userReferralAccount) {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitWithSwap, err_34;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitWithSwap, err_33;
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
                 if (userReferralAccount === void 0) { userReferralAccount = web3_js_1.PublicKey.default; }
                 return __generator(this, function (_a) {
@@ -6134,9 +6120,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitWithSwap);
                             return [3, 4];
                         case 3:
-                            err_34 = _a.sent();
-                            console.log("perpClient executeLimitWithSwap error:: ", err_34);
-                            throw err_34;
+                            err_33 = _a.sent();
+                            console.log("perpClient executeLimitWithSwap error:: ", err_33);
+                            throw err_33;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6146,7 +6132,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.placeTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_35;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_34;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6192,9 +6178,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_35 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_35);
-                        throw err_35;
+                        err_34 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_34);
+                        throw err_34;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6203,7 +6189,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.editTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_36;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_35;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6248,9 +6234,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_36 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_36);
-                        throw err_36;
+                        err_35 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_35);
+                        throw err_35;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6259,7 +6245,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_37;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_36;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6290,9 +6276,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_37 = _a.sent();
-                        console.log("perpClient cancelTriggerOrder error:: ", err_37);
-                        throw err_37;
+                        err_36 = _a.sent();
+                        console.log("perpClient cancelTriggerOrder error:: ", err_36);
+                        throw err_36;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6301,7 +6287,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelAllTriggerOrders = function (targetSymbol, collateralSymbol, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_38;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, positionAccount, cancelAllTriggerOrders, err_37;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6330,9 +6316,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelAllTriggerOrders);
                         return [3, 4];
                     case 3:
-                        err_38 = _a.sent();
-                        console.log("perpClient cancelAllTriggerOrders error:: ", err_38);
-                        throw err_38;
+                        err_37 = _a.sent();
+                        console.log("perpClient cancelAllTriggerOrders error:: ", err_37);
+                        throw err_37;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6346,7 +6332,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 9] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, targetSymbol_1, collateralSymbol_1, receivingSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1], args_1, true), void 0, function (owner, targetSymbol, collateralSymbol, receivingSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, collateralToken, receivingToken, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _c, _d, custody, executeTriggerWithSwap, err_39;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, collateralToken, receivingToken, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _c, _d, custody, executeTriggerWithSwap, err_38;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
@@ -6450,9 +6436,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerWithSwap);
                             return [3, 10];
                         case 9:
-                            err_39 = _e.sent();
-                            console.log("perpClient executeTriggerWithSwap error:: ", err_39);
-                            throw err_39;
+                            err_38 = _e.sent();
+                            console.log("perpClient executeTriggerWithSwap error:: ", err_38);
+                            throw err_38;
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6467,7 +6453,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 8] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([owner_1, targetSymbol_1, collateralSymbol_1, side_1, orderId_1, isStopLoss_1, privilege_1, poolConfig_1], args_1, true), void 0, function (owner, targetSymbol, collateralSymbol, side, orderId, isStopLoss, privilege, poolConfig, createUserATA, ephemeralSignerPubkey, tokenStakeAccount, userReferralAccount) {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_40;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_39;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (tokenStakeAccount === void 0) { tokenStakeAccount = web3_js_1.PublicKey.default; }
@@ -6536,9 +6522,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerOrder);
                             return [3, 8];
                         case 7:
-                            err_40 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_40);
-                            throw err_40;
+                            err_39 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_39);
+                            throw err_39;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6553,7 +6539,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 5] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([userInputTokenSymbol_1, userOutputTokenSymbol_1, amountIn_1, minAmountOut_1, poolConfig_1], args_1, true), void 0, function (userInputTokenSymbol, userOutputTokenSymbol, amountIn, minAmountOut, poolConfig, useFeesPool, createUserATA, unWrapSol, skipBalanceChecks, ephemeralSignerPubkey, isWhitelistedUser) {
-                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _e, _f, custody, whitelistPda, whitelistMeta, params, inx, closeWsolATAIns, err_41;
+                var userInputCustodyConfig, userOutputCustodyConfig, publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userOutputTokenAccount, userInputTokenAccount, wsolAssociatedTokenAccount, wsolATAExist, unWrappedSolBalance, _a, wsolAssociatedTokenAccount, closeWsolATAIns, accCreationLamports, lamports, unWrappedSolBalance, _b, tokenAccountBalance, _c, lamports, _d, custodyAccountMetas, custodyOracleAccountMetas, _e, _f, custody, whitelistPda, whitelistMeta, params, inx, closeWsolATAIns, err_40;
                 if (useFeesPool === void 0) { useFeesPool = false; }
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (unWrapSol === void 0) { unWrapSol = false; }
@@ -6764,9 +6750,9 @@ var PerpetualsClient = (function () {
                             }
                             return [3, 20];
                         case 19:
-                            err_41 = _g.sent();
-                            console.error("perpClient Swap error:: ", err_41);
-                            throw err_41;
+                            err_40 = _g.sent();
+                            console.error("perpClient Swap error:: ", err_40);
+                            throw err_40;
                         case 20: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -6776,7 +6762,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_42;
+            var rewardCustody, custody, publicKey, preInstructions, instructions, postInstructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody_1, params, inx, err_41;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -6830,9 +6816,9 @@ var PerpetualsClient = (function () {
                         instructions.push(inx);
                         return [3, 4];
                     case 3:
-                        err_42 = _b.sent();
-                        console.error("perpClient Swap error:: ", err_42);
-                        throw err_42;
+                        err_41 = _b.sent();
+                        console.error("perpClient Swap error:: ", err_41);
+                        throw err_41;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -6841,7 +6827,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setLpTokenPrice = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, setLpTokenPriceInstruction, err_43;
+            var instructions, additionalSigners, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, setLpTokenPriceInstruction, err_42;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -6889,9 +6875,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setLpTokenPriceInstruction);
                         return [3, 4];
                     case 3:
-                        err_43 = _d.sent();
-                        console.log("perpClient setLpTokenPriceInstruction error:: ", err_43);
-                        throw err_43;
+                        err_42 = _d.sent();
+                        console.log("perpClient setLpTokenPriceInstruction error:: ", err_42);
+                        throw err_42;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6939,7 +6925,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setAdminSigners = function (admins, minSignatures) { return __awaiter(_this, void 0, void 0, function () {
-            var adminMetas, _i, admins_2, admin, err_44;
+            var adminMetas, _i, admins_2, admin, err_43;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6969,11 +6955,11 @@ var PerpetualsClient = (function () {
                         _a.sent();
                         return [3, 4];
                     case 3:
-                        err_44 = _a.sent();
+                        err_43 = _a.sent();
                         if (this.printErrors) {
-                            console.error("setAdminSigners err:", err_44);
+                            console.error("setAdminSigners err:", err_43);
                         }
-                        throw err_44;
+                        throw err_43;
                     case 4: return [2];
                 }
             });
@@ -7170,7 +7156,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.protocolWithdrawFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_45;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_44;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7203,9 +7189,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_45 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_45);
-                        throw err_45;
+                        err_44 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_44);
+                        throw err_44;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7214,7 +7200,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.moveProtocolFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_46;
+            var publicKey, rewardCustodyConfig, instructions, additionalSigners, moveProtocolFeesIx, err_45;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7247,9 +7233,9 @@ var PerpetualsClient = (function () {
                         instructions.push(moveProtocolFeesIx);
                         return [3, 4];
                     case 3:
-                        err_46 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_46);
-                        throw err_46;
+                        err_45 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_45);
+                        throw err_45;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7258,7 +7244,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setProtocolFeeShareBps = function (feeShareBps, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, setProtocolFeeShareBpsIx, err_47;
+            var publicKey, setProtocolFeeShareBpsIx, err_46;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7278,15 +7264,15 @@ var PerpetualsClient = (function () {
                         setProtocolFeeShareBpsIx = _a.sent();
                         return [2, setProtocolFeeShareBpsIx];
                     case 2:
-                        err_47 = _a.sent();
-                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_47);
-                        throw err_47;
+                        err_46 = _a.sent();
+                        console.log("perpClient setProtocolFeeShareBpsIx error:: ", err_46);
+                        throw err_46;
                     case 3: return [2];
                 }
             });
         }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_48;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_47;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7313,9 +7299,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_48 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_48);
-                        throw err_48;
+                        err_47 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_47);
+                        throw err_47;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7324,7 +7310,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_49;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_48;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -7385,9 +7371,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_49 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_49);
-                        throw err_49;
+                        err_48 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_48);
+                        throw err_48;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7396,7 +7382,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalOraclePriceBatch = function (useCurrentTime, tokenMintList, tokenInternalPrices, POOL_CONFIGS) { return __awaiter(_this, void 0, void 0, function () {
-            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_1, _i, tokenMintList_1, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_50;
+            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_1, _i, tokenMintList_1, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_49;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7437,9 +7423,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_50 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_50);
-                        throw err_50;
+                        err_49 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_49);
+                        throw err_49;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7448,7 +7434,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalLazerPriceBatch = function (messageData, tokenMintList, pythStorage, pythTreasury, POOL_CONFIGS) { return __awaiter(_this, void 0, void 0, function () {
-            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_2, _i, tokenMintList_2, tokenMint, instructions, additionalSigners, setInternalLazerPrice, err_51;
+            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_2, _i, tokenMintList_2, tokenMint, instructions, additionalSigners, setInternalLazerPrice, err_50;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7489,9 +7475,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalLazerPrice);
                         return [3, 4];
                     case 3:
-                        err_51 = _a.sent();
-                        console.log("perpClient setInternalLazerPriceBatch error:: ", err_51);
-                        throw err_51;
+                        err_50 = _a.sent();
+                        console.log("perpClient setInternalLazerPriceBatch error:: ", err_50);
+                        throw err_50;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7500,7 +7486,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalOracleEmaPriceBatch = function (tokenMintList, tokenInternalEmaPrices, POOL_CONFIGS) { return __awaiter(_this, void 0, void 0, function () {
-            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_3, _i, tokenMintList_3, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_52;
+            var ALL_CUSTODY_CONFIGS, accountMetas, _loop_3, _i, tokenMintList_3, tokenMint, instructions, additionalSigners, setInternalOraclePrice, err_51;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7540,9 +7526,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_52 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_52);
-                        throw err_52;
+                        err_51 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_51);
+                        throw err_51;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7551,7 +7537,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setPositionPriceImpact = function (positionPubkey, priceImpactUsd, penaltyAuthority) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, setPositionPriceImpactIx, err_53;
+            var instructions, additionalSigners, setPositionPriceImpactIx, err_52;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7575,9 +7561,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPositionPriceImpactIx);
                         return [3, 4];
                     case 3:
-                        err_53 = _a.sent();
-                        console.log("perpClient setPositionPriceImpact error:: ", err_53);
-                        throw err_53;
+                        err_52 = _a.sent();
+                        console.log("perpClient setPositionPriceImpact error:: ", err_52);
+                        throw err_52;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -7586,7 +7572,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_54;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_53;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7624,8 +7610,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_54 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_54);
+                        err_53 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_53);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -7635,7 +7621,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_55;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_54;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7673,9 +7659,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_55 = _a.sent();
-                        console.log("perpClient InitStaking error:: ", err_55);
-                        throw err_55;
+                        err_54 = _a.sent();
+                        console.log("perpClient InitStaking error:: ", err_54);
+                        throw err_54;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7684,7 +7670,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_56;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_55;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7728,9 +7714,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initCompoundingInstruction);
                         return [3, 4];
                     case 3:
-                        err_56 = _a.sent();
-                        console.log("perpClient initCompounding error:: ", err_56);
-                        throw err_56;
+                        err_55 = _a.sent();
+                        console.log("perpClient initCompounding error:: ", err_55);
+                        throw err_55;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7739,7 +7725,7 @@ 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_57;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_56;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7780,9 +7766,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initTokenVaultInstruction);
                         return [3, 4];
                     case 3:
-                        err_57 = _a.sent();
-                        console.log("perpClient InitTokenVaultInstruction error:: ", err_57);
-                        throw err_57;
+                        err_56 = _a.sent();
+                        console.log("perpClient InitTokenVaultInstruction error:: ", err_56);
+                        throw err_56;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7790,8 +7776,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        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_58;
+        this.setTokenVaultConfig = function (token_permissions, withdrawTimeLimit, withdrawInstantFee, stakeLevel, unlockPeriod, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_57;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7809,6 +7795,7 @@ var PerpetualsClient = (function () {
                                 withdrawTimeLimit: withdrawTimeLimit,
                                 withdrawInstantFee: withdrawInstantFee,
                                 stakeLevel: stakeLevel,
+                                unlockPeriod: unlockPeriod,
                             })
                                 .accountsPartial({
                                 admin: publicKey,
@@ -7822,9 +7809,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenVaultConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_58 = _a.sent();
-                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_58);
-                        throw err_58;
+                        err_57 = _a.sent();
+                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_57);
+                        throw err_57;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7833,7 +7820,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawInstantFee = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_59;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_58;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7872,9 +7859,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawInstantFeeInstruction);
                         return [3, 6];
                     case 5:
-                        err_59 = _a.sent();
-                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_59);
-                        throw err_59;
+                        err_58 = _a.sent();
+                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_58);
+                        throw err_58;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7883,7 +7870,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawUnclaimedTokens = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawUnclaimedTokensInstruction, err_60;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawUnclaimedTokensInstruction, err_59;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7922,9 +7909,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawUnclaimedTokensInstruction);
                         return [3, 6];
                     case 5:
-                        err_60 = _a.sent();
-                        console.log("perpClient withdrawUnclaimedTokensInstruction error:: ", err_60);
-                        throw err_60;
+                        err_59 = _a.sent();
+                        console.log("perpClient withdrawUnclaimedTokensInstruction error:: ", err_59);
+                        throw err_59;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7933,7 +7920,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRevenueTokenAccount = function (feeShareBps, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_61;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_60;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7970,9 +7957,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRevenueTokenAccountInstruction);
                         return [3, 4];
                     case 3:
-                        err_61 = _a.sent();
-                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_61);
-                        throw err_61;
+                        err_60 = _a.sent();
+                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_60);
+                        throw err_60;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7981,7 +7968,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRebateVault = function (allowRebatePayout, rebateSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateCustodyMint, initRebateVaultInstruction, err_62;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateCustodyMint, initRebateVaultInstruction, err_61;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8016,9 +8003,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRebateVaultInstruction);
                         return [3, 4];
                     case 3:
-                        err_62 = _a.sent();
-                        console.log("perpClient initRebateVaultInstruction error:: ", err_62);
-                        throw err_62;
+                        err_61 = _a.sent();
+                        console.log("perpClient initRebateVaultInstruction error:: ", err_61);
+                        throw err_61;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8027,7 +8014,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.distributeTokenReward = function (amount, epochCount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_63;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_62;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8064,9 +8051,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_63 = _a.sent();
-                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_63);
-                        throw err_63;
+                        err_62 = _a.sent();
+                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_62);
+                        throw err_62;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8075,7 +8062,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenStakeLevel = function (owner, stakeLevel, isInitialized) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_64;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_63;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8104,9 +8091,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenStakeLevelInstruction);
                         return [3, 4];
                     case 3:
-                        err_64 = _a.sent();
-                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_64);
-                        throw err_64;
+                        err_63 = _a.sent();
+                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_63);
+                        throw err_63;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8115,7 +8102,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenReward = function (owner, amount, epochCount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_65;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_64;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8146,9 +8133,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_65 = _a.sent();
-                        console.log("perpClient setTokenRewardInstruction error:: ", err_65);
-                        throw err_65;
+                        err_64 = _a.sent();
+                        console.log("perpClient setTokenRewardInstruction error:: ", err_64);
+                        throw err_64;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8157,7 +8144,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.resizeInternalOracle = function (lazerFeedId, tokenMint, intOracleAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, resizeInternalOracleInstruction, err_66;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, resizeInternalOracleInstruction, err_65;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8186,9 +8173,9 @@ var PerpetualsClient = (function () {
                         instructions.push(resizeInternalOracleInstruction);
                         return [3, 4];
                     case 3:
-                        err_66 = _a.sent();
-                        console.log("perpClient resizeInternalOracleInstruction error:: ", err_66);
-                        throw err_66;
+                        err_65 = _a.sent();
+                        console.log("perpClient resizeInternalOracleInstruction error:: ", err_65);
+                        throw err_65;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8197,7 +8184,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.createWhitelist = function (isSwapFeeExempt, isDepositFeeExempt, isWithdrawalFeeExempt, poolAddress, owner) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, whitelist, createWhitelistInstruction, err_67;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, whitelist, createWhitelistInstruction, err_66;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8230,9 +8217,9 @@ var PerpetualsClient = (function () {
                         instructions.push(createWhitelistInstruction);
                         return [3, 4];
                     case 3:
-                        err_67 = _a.sent();
-                        console.log("perpClient createWhitelistInstruction error:: ", err_67);
-                        throw err_67;
+                        err_66 = _a.sent();
+                        console.log("perpClient createWhitelistInstruction error:: ", err_66);
+                        throw err_66;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8241,7 +8228,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setWhitelistConfig = function (isSwapFeeExempt, isDepositFeeExempt, isWithdrawalFeeExempt, poolAddress, owner) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, whitelist, setWhitelistConfigInstruction, err_68;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, whitelist, setWhitelistConfigInstruction, err_67;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8274,9 +8261,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setWhitelistConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_68 = _a.sent();
-                        console.log("perpClient setWhitelistConfigInstruction error:: ", err_68);
-                        throw err_68;
+                        err_67 = _a.sent();
+                        console.log("perpClient setWhitelistConfigInstruction error:: ", err_67);
+                        throw err_67;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8285,7 +8272,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setPerpetualsConfig = function (allowUngatedTrading, voltageMultiplier, tradingDiscount, referralRebate, defaultRebate, tradeLimit, triggerOrderLimit, rebateLimitUsd) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPerpetualsConfigInstruction, err_69;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPerpetualsConfigInstruction, err_68;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8319,9 +8306,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPerpetualsConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_69 = _a.sent();
-                        console.log("perpClient setPerpetualsConfigInstruction error:: ", err_69);
-                        throw err_69;
+                        err_68 = _a.sent();
+                        console.log("perpClient setPerpetualsConfigInstruction error:: ", err_68);
+                        throw err_68;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8330,7 +8317,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setPoolConfig = function (name, permissions, maxAumUsd, oracleAuthority, stakingFeeShareBps, vpVolumeFactor, stakingFeeBoostBps, minLpPriceUsd, maxLpPriceUsd, thresholdUsd) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPoolConfigInstruction, err_70;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPoolConfigInstruction, err_69;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8358,9 +8345,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPoolConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_70 = _a.sent();
-                        console.log("perpClient setPoolConfigInstruction error:: ", err_70);
-                        throw err_70;
+                        err_69 = _a.sent();
+                        console.log("perpClient setPoolConfigInstruction error:: ", err_69);
+                        throw err_69;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8369,7 +8356,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.addCustodyToken22 = function (poolName, tokenMint, tokenAccountSpace, token22) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addCustodyToken22Instruction, err_71;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addCustodyToken22Instruction, err_70;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8403,9 +8390,9 @@ var PerpetualsClient = (function () {
                         instructions.push(addCustodyToken22Instruction);
                         return [3, 4];
                     case 3:
-                        err_71 = _a.sent();
-                        console.log("perpClient addCustodyToken22Instruction error:: ", err_71);
-                        throw err_71;
+                        err_70 = _a.sent();
+                        console.log("perpClient addCustodyToken22Instruction error:: ", err_70);
+                        throw err_70;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8414,7 +8401,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.addMarket = function (poolName, targetCustody, collateralCustody, side, correlation, maxPayoffBps, permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, market, addMarketInstruction, err_72;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, market, addMarketInstruction, err_71;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8457,9 +8444,9 @@ var PerpetualsClient = (function () {
                         instructions.push(addMarketInstruction);
                         return [3, 4];
                     case 3:
-                        err_72 = _a.sent();
-                        console.log("perpClient addMarketInstruction error:: ", err_72);
-                        throw err_72;
+                        err_71 = _a.sent();
+                        console.log("perpClient addMarketInstruction error:: ", err_71);
+                        throw err_71;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8468,7 +8455,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setCustody = function (poolName, tokenMint, depegAdjustment, inversePrice, oracle, pricingConfig, permissions, fees, borrowRate, ratios, rewardThreshold, minReserveUsd, limitPriceBufferBps, token22) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setCustodyConfigInstruction, err_73;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setCustodyConfigInstruction, err_72;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8507,9 +8494,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setCustodyConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_73 = _a.sent();
-                        console.log("perpClient setCustodyConfigInstruction error:: ", err_73);
-                        throw err_73;
+                        err_72 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_72);
+                        throw err_72;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8518,7 +8505,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.addInternalOracle = function (exponent, lazerFeedId, tokenMint, intOracleAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, addInternalOracleInstruction, err_74;
+            var preInstructions, instructions, postInstructions, additionalSigners, addInternalOracleInstruction, err_73;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8548,9 +8535,9 @@ var PerpetualsClient = (function () {
                         instructions.push(addInternalOracleInstruction);
                         return [3, 4];
                     case 3:
-                        err_74 = _a.sent();
-                        console.log("perpClient setCustodyConfigInstruction error:: ", err_74);
-                        throw err_74;
+                        err_73 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_73);
+                        throw err_73;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8559,7 +8546,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setMarket = function (poolName, targetCustody, collateralCustody, marketAccount, maxPayoffBps, permissions, correlation) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setMarketConfigInstruction, err_75;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setMarketConfigInstruction, err_74;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8590,9 +8577,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setMarketConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_75 = _a.sent();
-                        console.log("perpClient setCustodyConfigInstruction error:: ", err_75);
-                        throw err_75;
+                        err_74 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_74);
+                        throw err_74;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8601,7 +8588,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.removeMarket = function (poolName, market, targetMint, collateralMint) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, removeMarketInstruction, err_76;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, removeMarketInstruction, err_75;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8633,9 +8620,9 @@ var PerpetualsClient = (function () {
                         instructions.push(removeMarketInstruction);
                         return [3, 4];
                     case 3:
-                        err_76 = _a.sent();
-                        console.log("perpClient setCustodyConfigInstruction error:: ", err_76);
-                        throw err_76;
+                        err_75 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_75);
+                        throw err_75;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8765,3 +8752,4 @@ var PerpetualsClient = (function () {
     return PerpetualsClient;
 }());
 exports.PerpetualsClient = PerpetualsClient;
+;