flash-sdk 11.11.5-alpha.0 → 11.11.6

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.");
@@ -68,7 +68,7 @@ var bs58_1 = require("bs58");
 var PositionAccount_1 = require("./PositionAccount");
 var types_1 = require("./types");
 var OraclePrice_1 = require("./OraclePrice");
-var perpetuals_json_1 = __importDefault(require("./idl/perpetuals.json"));
+var perpetuals_1 = require("./idl/perpetuals");
 var rpc_1 = require("./utils/rpc");
 var utils_1 = require("./utils");
 var constants_1 = require("./constants");
@@ -262,6 +262,11 @@ var PerpetualsClient = (function () {
                 tokenMint,
             ]).publicKey;
         };
+        this.getTradingAccount = function (tradingAccount) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.program.account.trading.fetch(tradingAccount)];
+            });
+        }); };
         this.getPosition = function (postionKey) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 return [2, this.program.account.position.fetch(postionKey)];
@@ -280,7 +285,7 @@ var PerpetualsClient = (function () {
                         _a.trys.push([1, 3, , 4]);
                         return [4, this.program.methods
                                 .getPositionData({})
-                                .accountsPartial({
+                                .accounts({
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
                                 position: position.publicKey,
@@ -385,7 +390,7 @@ var PerpetualsClient = (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        data = (0, bs58_1.encode)(new Uint8Array(marketKey.toBuffer()));
+                        data = (0, bs58_1.encode)(Buffer.concat([marketKey.toBuffer()]));
                         return [4, this.program.account.position.all([
                                 {
                                     memcmp: { bytes: data, offset: 40 }
@@ -402,7 +407,7 @@ var PerpetualsClient = (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        data = (0, bs58_1.encode)(new Uint8Array(marketKey.toBuffer()));
+                        data = (0, bs58_1.encode)(Buffer.concat([marketKey.toBuffer()]));
                         return [4, this.program.account.position.all([
                                 {
                                     memcmp: { bytes: data, offset: 40 }
@@ -445,7 +450,7 @@ var PerpetualsClient = (function () {
                         collateralCustodyConfig = poolConfig.custodies.find(function (f) { return f.mintKey.equals(collateralMint); });
                         return [4, this.program.methods
                                 .liquidate({})
-                                .accountsPartial({
+                                .accounts({
                                 signer: this.provider.wallet.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
@@ -455,6 +460,7 @@ var PerpetualsClient = (function () {
                                 targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
@@ -1969,72 +1975,204 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.getStakedLpTokenPrice = function (poolKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_1, token, _a, custodies_2, custody, _b, _c, market, transaction, backUpOracleInstruction, setCULimitIx, addressLookupTables, result, index, res;
-            var _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        backUpOracleInstructionPromise = (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true);
-                        custodies = POOL_CONFIG.custodies;
-                        custodyMetas = [];
-                        marketMetas = [];
-                        for (_i = 0, custodies_1 = custodies; _i < custodies_1.length; _i++) {
-                            token = custodies_1[_i];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: token.custodyAccount,
-                            });
-                        }
-                        for (_a = 0, custodies_2 = custodies; _a < custodies_2.length; _a++) {
-                            custody = custodies_2[_a];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: custody.intOracleAccount,
-                            });
-                        }
-                        for (_b = 0, _c = POOL_CONFIG.markets; _b < _c.length; _b++) {
-                            market = _c[_b];
-                            marketMetas.push({
-                                pubkey: market.marketAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        return [4, this.program.methods
-                                .getLpTokenPrice({})
-                                .accountsPartial({
-                                perpetuals: POOL_CONFIG.perpetuals,
-                                pool: poolKey,
-                                lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
-                                .transaction()];
-                    case 1:
-                        transaction = _e.sent();
-                        return [4, backUpOracleInstructionPromise];
-                    case 2:
-                        backUpOracleInstruction = _e.sent();
-                        setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
-                        transaction.instructions.unshift(setCULimitIx);
-                        (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
-                        return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
-                    case 3:
-                        addressLookupTables = (_e.sent()).addressLookupTables;
-                        return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables)];
-                    case 4:
-                        result = _e.sent();
-                        index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'getLpTokenPrice'; });
-                        res = this.viewHelper.decodeLogs(result, index, 'getLpTokenPrice');
-                        return [2, res.toString()];
-                }
+        this.getLpTokenPriceView = function (poolConfig_1) {
+            var args_1 = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args_1[_i - 1] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([poolConfig_1], args_1, true), void 0, function (poolConfig, includeRemainingAccounts) {
+                var custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market;
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            custodyAccountMetas = [];
+                            custodyOracleAccountMetas = [];
+                            markets = [];
+                            for (_a = 0, _b = poolConfig.custodies; _a < _b.length; _a++) {
+                                custody = _b[_a];
+                                custodyAccountMetas.push({
+                                    pubkey: custody.custodyAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyOracleAccountMetas.push({
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            for (_c = 0, _d = poolConfig.markets; _c < _d.length; _c++) {
+                                market = _d[_c];
+                                markets.push({
+                                    pubkey: market.marketAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            return [4, this.program.methods
+                                    .getLpTokenPrice({})
+                                    .accounts({
+                                    perpetuals: this.perpetuals.publicKey,
+                                    pool: poolConfig.poolAddress,
+                                    lpTokenMint: poolConfig.stakedLpTokenMint,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true) : [])
+                                    .view()
+                                    .catch(function (err) {
+                                    console.error(err);
+                                    throw err;
+                                })];
+                        case 1: return [2, _e.sent()];
+                    }
+                });
             });
-        }); };
+        };
+        this.getStakedLpTokenPrice = function (poolKey_1, POOL_CONFIG_1) {
+            var args_1 = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([poolKey_1, POOL_CONFIG_1], args_1, true), void 0, function (poolKey, POOL_CONFIG, includeRemainingAccounts) {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_1, token, _b, custodies_2, custody, _c, _d, market, transaction, backUpOracleInstruction, setCULimitIx, addressLookupTables, result, index, res;
+                var _e;
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0:
+                            backUpOracleInstructionPromise = (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true);
+                            custodies = POOL_CONFIG.custodies;
+                            custodyMetas = [];
+                            marketMetas = [];
+                            for (_a = 0, custodies_1 = custodies; _a < custodies_1.length; _a++) {
+                                token = custodies_1[_a];
+                                custodyMetas.push({
+                                    isSigner: false,
+                                    isWritable: false,
+                                    pubkey: token.custodyAccount,
+                                });
+                            }
+                            for (_b = 0, custodies_2 = custodies; _b < custodies_2.length; _b++) {
+                                custody = custodies_2[_b];
+                                custodyMetas.push({
+                                    isSigner: false,
+                                    isWritable: false,
+                                    pubkey: custody.intOracleAccount,
+                                });
+                            }
+                            for (_c = 0, _d = POOL_CONFIG.markets; _c < _d.length; _c++) {
+                                market = _d[_c];
+                                marketMetas.push({
+                                    pubkey: market.marketAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            return [4, this.program.methods
+                                    .getLpTokenPrice({})
+                                    .accounts({
+                                    perpetuals: POOL_CONFIG.perpetuals,
+                                    pool: poolKey,
+                                    lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                })
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true) : [])
+                                    .transaction()];
+                        case 1:
+                            transaction = _f.sent();
+                            return [4, backUpOracleInstructionPromise];
+                        case 2:
+                            backUpOracleInstruction = _f.sent();
+                            setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
+                            transaction.instructions.unshift(setCULimitIx);
+                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
+                        case 3:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables)];
+                        case 4:
+                            result = _f.sent();
+                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getLpTokenPrice'; });
+                            res = this.viewHelper.decodeLogs(result, index, 'getLpTokenPrice');
+                            return [2, res.toString()];
+                    }
+                });
+            });
+        };
+        this.getCompoundingLPTokenPrice = function (poolKey_1, POOL_CONFIG_1) {
+            var args_1 = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([poolKey_1, POOL_CONFIG_1], args_1, true), void 0, function (poolKey, POOL_CONFIG, includeRemainingAccounts) {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_3, token, _b, custodies_4, custody, _c, _d, market, backUpOracleInstruction, transaction, setCULimitIx, addressLookupTables, result, index, res;
+                var _e;
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0:
+                            backUpOracleInstructionPromise = (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true);
+                            custodies = POOL_CONFIG.custodies;
+                            custodyMetas = [];
+                            marketMetas = [];
+                            for (_a = 0, custodies_3 = custodies; _a < custodies_3.length; _a++) {
+                                token = custodies_3[_a];
+                                custodyMetas.push({
+                                    isSigner: false,
+                                    isWritable: false,
+                                    pubkey: token.custodyAccount,
+                                });
+                            }
+                            for (_b = 0, custodies_4 = custodies; _b < custodies_4.length; _b++) {
+                                custody = custodies_4[_b];
+                                custodyMetas.push({
+                                    isSigner: false,
+                                    isWritable: false,
+                                    pubkey: custody.intOracleAccount,
+                                });
+                            }
+                            for (_c = 0, _d = POOL_CONFIG.markets; _c < _d.length; _c++) {
+                                market = _d[_c];
+                                marketMetas.push({
+                                    pubkey: market.marketAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            return [4, backUpOracleInstructionPromise];
+                        case 1:
+                            backUpOracleInstruction = _f.sent();
+                            return [4, this.program.methods
+                                    .getCompoundingTokenPrice({})
+                                    .accounts({
+                                    perpetuals: POOL_CONFIG.perpetuals,
+                                    pool: poolKey,
+                                    lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                })
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true) : [])
+                                    .transaction()];
+                        case 2:
+                            transaction = _f.sent();
+                            setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
+                            transaction.instructions.unshift(setCULimitIx);
+                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
+                        case 3:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables)];
+                        case 4:
+                            result = _f.sent();
+                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getCompoundingTokenPrice'; });
+                            res = this.viewHelper.decodeLogs(result, index, 'getCompoundingTokenPrice');
+                            return [2, res.toString()];
+                    }
+                });
+            });
+        };
         this.getAssetsUnderManagement = function (poolKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_3, token, _a, custodies_4, custody, _b, _c, market;
+            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_5, token, _a, custodies_6, custody, _b, _c, market;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2042,16 +2180,16 @@ var PerpetualsClient = (function () {
                         custodies = POOL_CONFIG.custodies;
                         custodyMetas = [];
                         marketMetas = [];
-                        for (_i = 0, custodies_3 = custodies; _i < custodies_3.length; _i++) {
-                            token = custodies_3[_i];
+                        for (_i = 0, custodies_5 = custodies; _i < custodies_5.length; _i++) {
+                            token = custodies_5[_i];
                             custodyMetas.push({
                                 isSigner: false,
                                 isWritable: false,
                                 pubkey: token.custodyAccount,
                             });
                         }
-                        for (_a = 0, custodies_4 = custodies; _a < custodies_4.length; _a++) {
-                            custody = custodies_4[_a];
+                        for (_a = 0, custodies_6 = custodies; _a < custodies_6.length; _a++) {
+                            custody = custodies_6[_a];
                             custodyMetas.push({
                                 isSigner: false,
                                 isWritable: false,
@@ -2068,7 +2206,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .getAssetsUnderManagement({})
-                                .accountsPartial({
+                                .accounts({
                                 perpetuals: POOL_CONFIG.perpetuals,
                                 pool: poolKey,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -2089,7 +2227,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 4] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, depositCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle, whitelist) {
-                var custodies, custodyMetas, marketMetas, _a, custodies_5, token, _b, custodies_6, custody, _c, _d, market, whitelistMeta, depositCustodyConfig, transaction, setCULimitIx, backUpOracleInstruction, addressLookupTables, result, index, res;
+                var custodies, custodyMetas, marketMetas, _a, custodies_7, token, _b, custodies_8, custody, _c, _d, market, whitelistMeta, depositCustodyConfig, transaction, setCULimitIx, backUpOracleInstruction, addressLookupTables, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
@@ -2100,16 +2238,16 @@ var PerpetualsClient = (function () {
                             custodies = POOL_CONFIG.custodies;
                             custodyMetas = [];
                             marketMetas = [];
-                            for (_a = 0, custodies_5 = custodies; _a < custodies_5.length; _a++) {
-                                token = custodies_5[_a];
+                            for (_a = 0, custodies_7 = custodies; _a < custodies_7.length; _a++) {
+                                token = custodies_7[_a];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
                                     pubkey: token.custodyAccount,
                                 });
                             }
-                            for (_b = 0, custodies_6 = custodies; _b < custodies_6.length; _b++) {
-                                custody = custodies_6[_b];
+                            for (_b = 0, custodies_8 = custodies; _b < custodies_8.length; _b++) {
+                                custody = custodies_8[_b];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
@@ -2134,7 +2272,7 @@ var PerpetualsClient = (function () {
                                     .getAddLiquidityAmountAndFee({
                                     amountIn: amount,
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     perpetuals: POOL_CONFIG.perpetuals,
                                     pool: poolKey,
                                     custody: depositCustodyKey,
@@ -2168,7 +2306,7 @@ var PerpetualsClient = (function () {
                                         error: 'Simulation failed: ' + JSON.stringify(result.value.err),
                                     }];
                             }
-                            index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'getAddLiquidityAmountAndFee'; });
+                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddLiquidityAmountAndFee'; });
                             res = this.viewHelper.decodeLogs(result, index, 'getAddLiquidityAmountAndFee');
                             return [2, {
                                     amount: res.amount,
@@ -2184,7 +2322,7 @@ var PerpetualsClient = (function () {
                 args_1[_i - 4] = arguments[_i];
             }
             return __awaiter(_this, __spreadArray([amount_1, poolKey_1, removeTokenCustodyKey_1, POOL_CONFIG_1], args_1, true), void 0, function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG, userPublicKey, enableBackupOracle, whitelist) {
-                var custodies, custodyMetas, marketMetas, _a, custodies_7, token, _b, custodies_8, custody, _c, _d, market, whitelistMeta, removeCustodyConfig, transaction, setCULimitIx, backUpOracleInstruction, addressLookupTables, result, index, res;
+                var custodies, custodyMetas, marketMetas, _a, custodies_9, token, _b, custodies_10, custody, _c, _d, market, whitelistMeta, removeCustodyConfig, transaction, setCULimitIx, backUpOracleInstruction, addressLookupTables, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
@@ -2195,16 +2333,16 @@ var PerpetualsClient = (function () {
                             custodies = POOL_CONFIG.custodies;
                             custodyMetas = [];
                             marketMetas = [];
-                            for (_a = 0, custodies_7 = custodies; _a < custodies_7.length; _a++) {
-                                token = custodies_7[_a];
+                            for (_a = 0, custodies_9 = custodies; _a < custodies_9.length; _a++) {
+                                token = custodies_9[_a];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
                                     pubkey: token.custodyAccount,
                                 });
                             }
-                            for (_b = 0, custodies_8 = custodies; _b < custodies_8.length; _b++) {
-                                custody = custodies_8[_b];
+                            for (_b = 0, custodies_10 = custodies; _b < custodies_10.length; _b++) {
+                                custody = custodies_10[_b];
                                 custodyMetas.push({
                                     isSigner: false,
                                     isWritable: false,
@@ -2229,7 +2367,7 @@ var PerpetualsClient = (function () {
                                     .getRemoveLiquidityAmountAndFee({
                                     lpAmountIn: amount,
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     perpetuals: POOL_CONFIG.perpetuals,
                                     pool: poolKey,
                                     custody: removeTokenCustodyKey,
@@ -2255,7 +2393,7 @@ var PerpetualsClient = (function () {
                             return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
                         case 5:
                             result = _f.sent();
-                            index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'getRemoveLiquidityAmountAndFee'; });
+                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveLiquidityAmountAndFee'; });
                             if (result.value.err) {
                                 console.error('error Simulation failed:', result);
                                 return [2, {
@@ -2273,70 +2411,6 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.getCompoundingLPTokenPrice = function (poolKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_9, token, _a, custodies_10, custody, _b, _c, market, backUpOracleInstruction, transaction, setCULimitIx, addressLookupTables, result, index, res;
-            var _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        backUpOracleInstructionPromise = (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true);
-                        custodies = POOL_CONFIG.custodies;
-                        custodyMetas = [];
-                        marketMetas = [];
-                        for (_i = 0, custodies_9 = custodies; _i < custodies_9.length; _i++) {
-                            token = custodies_9[_i];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: token.custodyAccount,
-                            });
-                        }
-                        for (_a = 0, custodies_10 = custodies; _a < custodies_10.length; _a++) {
-                            custody = custodies_10[_a];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: custody.intOracleAccount,
-                            });
-                        }
-                        for (_b = 0, _c = POOL_CONFIG.markets; _b < _c.length; _b++) {
-                            market = _c[_b];
-                            marketMetas.push({
-                                pubkey: market.marketAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        return [4, backUpOracleInstructionPromise];
-                    case 1:
-                        backUpOracleInstruction = _e.sent();
-                        return [4, this.program.methods
-                                .getCompoundingTokenPrice({})
-                                .accountsPartial({
-                                perpetuals: POOL_CONFIG.perpetuals,
-                                pool: poolKey,
-                                lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
-                                .transaction()];
-                    case 2:
-                        transaction = _e.sent();
-                        setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
-                        transaction.instructions.unshift(setCULimitIx);
-                        (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
-                        return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
-                    case 3:
-                        addressLookupTables = (_e.sent()).addressLookupTables;
-                        return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables)];
-                    case 4:
-                        result = _e.sent();
-                        index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'getCompoundingTokenPrice'; });
-                        res = this.viewHelper.decodeLogs(result, index, 'getCompoundingTokenPrice');
-                        return [2, res.toString()];
-                }
-            });
-        }); };
         this.getAddCompoundingLiquidityAmountAndFeeView = function (amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1) {
             var args_1 = [];
             for (var _i = 4; _i < arguments.length; _i++) {
@@ -2389,7 +2463,7 @@ var PerpetualsClient = (function () {
                                     .getAddCompoundingLiquidityAmountAndFee({
                                     amountIn: amount,
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     perpetuals: POOL_CONFIG.perpetuals,
                                     pool: poolKey,
                                     inCustody: depositCustodyKey,
@@ -2418,7 +2492,7 @@ var PerpetualsClient = (function () {
                         case 4: return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
                         case 5:
                             result = _f.sent();
-                            index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'getAddCompoundingLiquidityAmountAndFee'; });
+                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddCompoundingLiquidityAmountAndFee'; });
                             res = this.viewHelper.decodeLogs(result, index, 'getAddCompoundingLiquidityAmountAndFee');
                             return [2, {
                                     amount: res.amount,
@@ -2480,7 +2554,7 @@ var PerpetualsClient = (function () {
                                     .getRemoveCompoundingLiquidityAmountAndFee({
                                     compoundingAmountIn: amount,
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     perpetuals: POOL_CONFIG.perpetuals,
                                     pool: poolKey,
                                     outCustody: removeTokenCustodyKey,
@@ -2509,7 +2583,7 @@ var PerpetualsClient = (function () {
                             return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
                         case 5:
                             result = _f.sent();
-                            index = perpetuals_json_1.default.instructions.findIndex(function (f) { return f.name === 'getRemoveCompoundingLiquidityAmountAndFee'; });
+                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveCompoundingLiquidityAmountAndFee'; });
                             if (result.value.err) {
                                 return [2, {
                                         amount: new anchor_1.BN(0),
@@ -2542,7 +2616,7 @@ var PerpetualsClient = (function () {
                         collateralCustodyConfig = poolConfig.custodies.find(function (f) { return f.custodyAccount.equals(marketConfig_1.collateralCustody); });
                         return [4, this.program.methods
                                 .getLiquidationPrice({})
-                                .accountsPartial({
+                                .accounts({
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
                                 position: positionAccountKey,
@@ -2576,7 +2650,7 @@ var PerpetualsClient = (function () {
                         collateralCustodyConfig = poolConfig.custodies.find(function (f) { return f.mintKey.equals(collateralMint); });
                         return [4, this.program.methods
                                 .getLiquidationState({})
-                                .accountsPartial({
+                                .accounts({
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
                                 position: positionAccount,
@@ -2626,54 +2700,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .getCompoundingTokenData({})
-                                .accountsPartial({
-                                perpetuals: this.perpetuals.publicKey,
-                                pool: poolConfig.poolAddress,
-                                lpTokenMint: poolConfig.stakedLpTokenMint,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
-                                .view()
-                                .catch(function (err) {
-                                console.error(err);
-                                throw err;
-                            })];
-                    case 1: return [2, _d.sent()];
-                }
-            });
-        }); };
-        this.getLpTokenPriceView = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        custodyAccountMetas = [];
-                        custodyOracleAccountMetas = [];
-                        markets = [];
-                        for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
-                            custody = _a[_i];
-                            custodyAccountMetas.push({
-                                pubkey: custody.custodyAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                            custodyOracleAccountMetas.push({
-                                pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        for (_b = 0, _c = poolConfig.markets; _b < _c.length; _b++) {
-                            market = _c[_b];
-                            markets.push({
-                                pubkey: market.marketAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        return [4, this.program.methods
-                                .getLpTokenPrice({})
-                                .accountsPartial({
+                                .accounts({
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
                                 lpTokenMint: poolConfig.stakedLpTokenMint,
@@ -2769,7 +2796,7 @@ var PerpetualsClient = (function () {
                             };
                             return [4, this.program.methods
                                     .openPosition(params)
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     fundingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userCollateralTokenAccount,
@@ -2784,6 +2811,8 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     transferAuthority: this.authority.publicKey,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: collateralCustodyConfig.mintKey
@@ -2868,7 +2897,7 @@ var PerpetualsClient = (function () {
                                     priceWithSlippage: priceWithSlippage,
                                     privilege: privilege
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     feePayer: publicKey,
                                     owner: publicKey,
                                     receivingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
@@ -2883,6 +2912,7 @@ var PerpetualsClient = (function () {
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID
@@ -3019,7 +3049,7 @@ var PerpetualsClient = (function () {
                                     sizeAmount: sizeAmount,
                                     privilege: privilege
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     fundingAccount: userInputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
@@ -3038,6 +3068,7 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: userInputCustodyConfig.mintKey,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(userInputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
@@ -3144,7 +3175,7 @@ var PerpetualsClient = (function () {
                                     priceWithSlippage: priceWithSlippage,
                                     privilege: privilege
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     receivingAccount: userOutputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
@@ -3162,6 +3193,8 @@ var PerpetualsClient = (function () {
                                     dispensingCustody: userOutputCustodyConfig.custodyAccount,
                                     dispensingOracleAccount: this.useExtOracleAccount ? userOutputCustodyConfig.extOracleAccount : userOutputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: userOutputCustodyConfig.mintKey,
                                     receivingTokenProgram: userOutputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
@@ -3259,7 +3292,7 @@ var PerpetualsClient = (function () {
                             _c.label = 6;
                         case 6: return [4, this.program.methods.addCollateral({
                                 collateralDelta: collateralWithFee
-                            }).accountsPartial({
+                            }).accounts({
                                 owner: publicKey,
                                 position: positionPubKey,
                                 market: marketAccount,
@@ -3271,7 +3304,9 @@ var PerpetualsClient = (function () {
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 fundingTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 fundingMint: collateralCustodyConfig.mintKey
                             })
@@ -3371,7 +3406,7 @@ var PerpetualsClient = (function () {
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, this.program.methods.swapAndAddCollateral({
                                     amountIn: amountIn,
-                                }).accountsPartial({
+                                }).accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     fundingAccount: inputSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
@@ -3388,7 +3423,9 @@ var PerpetualsClient = (function () {
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(inputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: poolConfig.getTokenFromSymbol(inputSymbol).mintKey,
                                 })
@@ -3475,7 +3512,7 @@ var PerpetualsClient = (function () {
                                     .removeCollateral({
                                     collateralDeltaUsd: collateralDeltaUsd,
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     receivingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -3490,6 +3527,7 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     receivingTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: collateralCustodyConfig.mintKey
                                 })
@@ -3578,7 +3616,7 @@ var PerpetualsClient = (function () {
                                     .removeCollateralAndSwap({
                                     collateralDeltaUsd: collateralDeltaUsd,
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     receivingAccount: outputSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
@@ -3596,6 +3634,8 @@ var PerpetualsClient = (function () {
                                     dispensingCustody: outputCustodyConfig.custodyAccount,
                                     dispensingOracleAccount: this.useExtOracleAccount ? outputCustodyConfig.extOracleAccount : outputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: outputCustodyConfig.mintKey,
                                     receivingTokenProgram: poolConfig.getTokenFromSymbol(outputSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
@@ -3647,7 +3687,7 @@ var PerpetualsClient = (function () {
                                     sizeDelta: sizeDelta,
                                     privilege: privilege
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
@@ -3661,6 +3701,7 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey
                                 })
@@ -3710,7 +3751,7 @@ var PerpetualsClient = (function () {
                                     sizeDelta: sizeDelta,
                                     privilege: privilege
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
@@ -3724,6 +3765,7 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey
                                 })
@@ -3745,11 +3787,12 @@ var PerpetualsClient = (function () {
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([payTokenSymbol_1, tokenAmountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (payTokenSymbol, tokenAmountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, isWhitelistedUser) {
+            return __awaiter(_this, __spreadArray([payTokenSymbol_1, tokenAmountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (payTokenSymbol, tokenAmountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, isWhitelistedUser, includeRemainingAccounts) {
                 var publicKey, payTokenCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, payToken, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, tokenAccountBalance, _f, whitelistPda, whitelistMeta, instruction, err_5;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
@@ -3855,7 +3898,7 @@ var PerpetualsClient = (function () {
                                     amountIn: tokenAmountIn,
                                     minLpAmountOut: minLpAmountOut
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     fundingAccount: payTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userPayingTokenAccount,
                                     lpTokenAccount: lpTokenAccount,
@@ -3868,11 +3911,12 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: poolConfig.stakedLpTokenMint,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: payTokenCustodyConfig.mintKey,
                                     fundingTokenProgram: payToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true) : __spreadArray([], (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
                         case 9:
                             instruction = _g.sent();
@@ -3895,12 +3939,13 @@ var PerpetualsClient = (function () {
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([inputSymbol_1, amountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (inputSymbol, amountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey, isWhitelistedUser) {
+            return __awaiter(_this, __spreadArray([inputSymbol_1, amountIn_1, minLpAmountOut_1, poolConfig_1], args_1, true), void 0, function (inputSymbol, amountIn, minLpAmountOut, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey, isWhitelistedUser, includeRemainingAccounts) {
                 var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, inputToken, flpStakeAccount, poolStakedLpVault, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, whitelistPda, whitelistMeta, instruction;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
@@ -4001,7 +4046,7 @@ var PerpetualsClient = (function () {
                             return [4, this.program.methods.addLiquidityAndStake({
                                     amountIn: amountIn,
                                     minLpAmountOut: minLpAmountOut,
-                                }).accountsPartial({
+                                }).accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     fundingAccount: inputSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
@@ -4016,11 +4061,13 @@ var PerpetualsClient = (function () {
                                     poolStakedLpVault: poolStakedLpVault,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: inputCustodyConfig.mintKey,
                                     fundingTokenProgram: inputToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true) : __spreadArray([], (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
                         case 8:
                             instruction = _g.sent();
@@ -4038,7 +4085,7 @@ var PerpetualsClient = (function () {
             for (var _i = 4; _i < arguments.length; _i++) {
                 args_1[_i - 4] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([recieveTokenSymbol_1, liquidityAmountIn_1, minTokenAmountOut_1, poolConfig_1], args_1, true), void 0, function (recieveTokenSymbol, liquidityAmountIn, minTokenAmountOut, poolConfig, closeLpATA, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey, userPublicKey, isWhitelistedUser) {
+            return __awaiter(_this, __spreadArray([recieveTokenSymbol_1, liquidityAmountIn_1, minTokenAmountOut_1, poolConfig_1], args_1, true), void 0, function (recieveTokenSymbol, liquidityAmountIn, minTokenAmountOut, poolConfig, closeLpATA, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey, userPublicKey, isWhitelistedUser, includeRemainingAccounts) {
                 var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, recieveToken, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, _e, whitelistPda, whitelistMeta, removeLiquidityTx, closeInx, closeWsolATAIns, err_6;
                 if (closeLpATA === void 0) { closeLpATA = false; }
                 if (createUserATA === void 0) { createUserATA = true; }
@@ -4046,6 +4093,7 @@ var PerpetualsClient = (function () {
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -4132,7 +4180,7 @@ var PerpetualsClient = (function () {
                                     lpAmountIn: liquidityAmountIn,
                                     minAmountOut: minTokenAmountOut
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     receivingAccount: recieveTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
                                     lpTokenAccount: stakedLpTokenAccount,
@@ -4145,11 +4193,12 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: poolConfig.stakedLpTokenMint,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: recieveTokenCustodyConfig.mintKey,
                                     receivingTokenProgram: recieveToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true) : __spreadArray([], (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
                         case 6:
                             removeLiquidityTx = _f.sent();
@@ -4190,7 +4239,7 @@ var PerpetualsClient = (function () {
                         _a.trys.push([1, 3, , 4]);
                         return [4, this.program.methods
                                 .createReferral({})
-                                .accountsPartial({
+                                .accounts({
                                 owner: publicKey,
                                 feePayer: publicKey,
                                 referralAccount: nftReferralAccount,
@@ -4235,7 +4284,7 @@ var PerpetualsClient = (function () {
                                 .depositStake({
                                 depositAmount: depositAmount
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: owner,
                                 feePayer: feePayer,
                                 fundingLpTokenAccount: userLpTokenAccount,
@@ -4246,6 +4295,8 @@ var PerpetualsClient = (function () {
                                 poolStakedLpVault: poolStakedLpVault,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                                 lpTokenMint: poolConfig.stakedLpTokenMint,
                             })
                                 .instruction()];
@@ -4298,11 +4349,12 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .refreshStake({})
-                                .accountsPartial({
+                                .accounts({
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: pool,
                                 rewardCustody: rewardCustodyConfig.custodyAccount,
                                 feeDistributionTokenAccount: feeDistributionTokenAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), flpStakeAccountMetas, true))
@@ -4358,11 +4410,12 @@ var PerpetualsClient = (function () {
                             });
                             return [4, this.program.methods
                                     .refreshStake({})
-                                    .accountsPartial({
+                                    .accounts({
                                     perpetuals: this.perpetuals.publicKey,
                                     pool: pool,
                                     rewardCustody: rewardCustodyConfig.custodyAccount,
                                     feeDistributionTokenAccount: feeDistributionTokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), stakeAccountMetas, true))
@@ -4421,12 +4474,13 @@ var PerpetualsClient = (function () {
                                     .unstakeInstant({
                                     unstakeAmount: unstakeAmount
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     perpetuals: this.perpetuals.publicKey,
                                     pool: pool,
                                     flpStakeAccount: flpStakeAccount,
                                     rewardCustody: rewardCustodyConfig.custodyAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                 })
                                     .remainingAccounts(__spreadArray([], tokenStakeAccounts, true))
@@ -4481,7 +4535,7 @@ var PerpetualsClient = (function () {
                                 .setFeeShare({
                                 feeShareBps: new anchor_1.BN(7000)
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 pool: pool,
@@ -4518,13 +4572,14 @@ var PerpetualsClient = (function () {
                                 .unstakeRequest({
                                 unstakeAmount: unstakeAmount
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: publicKey,
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: pool,
                                 flpStakeAccount: flpStakeAccount,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId
                             })
                                 .instruction()];
@@ -4585,7 +4640,7 @@ var PerpetualsClient = (function () {
                                     pendingActivation: pendingActivation,
                                     deactivated: deactivated
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     receivingLpTokenAccount: userLpTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -4595,6 +4650,7 @@ var PerpetualsClient = (function () {
                                     poolStakedLpVault: poolStakedLpVault,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                     lpMint: poolConfig.stakedLpTokenMint,
                                 })
@@ -4659,7 +4715,7 @@ var PerpetualsClient = (function () {
                             }
                             return [4, this.program.methods
                                     .collectStakeFees({})
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     receivingTokenAccount: receivingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -4671,6 +4727,7 @@ var PerpetualsClient = (function () {
                                     program: this.program.programId,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: rewardCustodyMint,
                                 })
@@ -4697,13 +4754,14 @@ var PerpetualsClient = (function () {
             for (var _i = 5; _i < arguments.length; _i++) {
                 args_1[_i - 5] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([amountIn_1, minCompoundingAmountOut_1, inTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey, enableHeapSizeIx, isWhitelistedUser) {
+            return __awaiter(_this, __spreadArray([amountIn_1, minCompoundingAmountOut_1, inTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey, enableHeapSizeIx, isWhitelistedUser, includeRemainingAccounts) {
                 var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, heapSizeIx, whitelistPda, whitelistMeta, addCompoundingLiquidity, err_16;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableHeapSizeIx === void 0) { enableHeapSizeIx = true; }
                 if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -4811,7 +4869,7 @@ var PerpetualsClient = (function () {
                                     amountIn: amountIn,
                                     minCompoundingAmountOut: minCompoundingAmountOut
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     fundingAccount: inTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : fundingAccount,
                                     compoundingTokenAccount: compoundingTokenAccount,
@@ -4827,12 +4885,13 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: lpTokenMint,
                                     compoundingTokenMint: compoundingTokenMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: inCustodyConfig.mintKey,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(inTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true) : __spreadArray([], (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
                         case 8:
                             addCompoundingLiquidity = _f.sent();
@@ -4855,13 +4914,14 @@ var PerpetualsClient = (function () {
             for (var _i = 5; _i < arguments.length; _i++) {
                 args_1[_i - 5] = arguments[_i];
             }
-            return __awaiter(_this, __spreadArray([compoundingAmountIn_1, minAmountOut_1, outTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (compoundingAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA, ephemeralSignerPubkey, userPublicKey, enableHeapSizeIx, isWhitelistedUser) {
+            return __awaiter(_this, __spreadArray([compoundingAmountIn_1, minAmountOut_1, outTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (compoundingAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA, ephemeralSignerPubkey, userPublicKey, enableHeapSizeIx, isWhitelistedUser, includeRemainingAccounts) {
                 var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, compoundingTokenAccount, heapSizeIx, whitelistPda, whitelistMeta, removeCompoundingLiquidity, err_17;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableHeapSizeIx === void 0) { enableHeapSizeIx = true; }
                 if (isWhitelistedUser === void 0) { isWhitelistedUser = false; }
+                if (includeRemainingAccounts === void 0) { includeRemainingAccounts = true; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -4953,7 +5013,7 @@ var PerpetualsClient = (function () {
                                     compoundingAmountIn: compoundingAmountIn,
                                     minAmountOut: minAmountOut
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     receivingAccount: outCustodyConfig.symbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
                                     compoundingTokenAccount: compoundingTokenAccount,
@@ -4969,12 +5029,13 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: lpTokenMint,
                                     compoundingTokenMint: compoundingTokenMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: outCustodyConfig.mintKey,
                                     receivingTokenProgram: poolConfig.getTokenFromSymbol(outTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
                                 })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true))
+                                    .remainingAccounts(includeRemainingAccounts ? __spreadArray(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true), (isWhitelistedUser ? [whitelistMeta] : []), true) : __spreadArray([], (isWhitelistedUser ? [whitelistMeta] : []), true))
                                     .instruction()];
                         case 6:
                             removeCompoundingLiquidity = _f.sent();
@@ -5071,7 +5132,7 @@ var PerpetualsClient = (function () {
                                     .migrateStake({
                                     amount: amount
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     compoundingTokenAccount: compoudingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -5085,6 +5146,7 @@ var PerpetualsClient = (function () {
                                     lpTokenMint: lpTokenMint,
                                     compoundingTokenMint: compoundingTokenMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
@@ -5153,7 +5215,7 @@ var PerpetualsClient = (function () {
                                 .migrateFlp({
                                 compoundingTokenAmount: amount
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: publicKey,
                                 compoundingTokenAccount: compoudingTokenAccount,
                                 transferAuthority: poolConfig.transferAuthority,
@@ -5168,6 +5230,7 @@ var PerpetualsClient = (function () {
                                 compoundingTokenMint: compoundingTokenMint,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
@@ -5232,7 +5295,7 @@ var PerpetualsClient = (function () {
                             _e.trys.push([1, 3, , 4]);
                             return [4, this.program.methods
                                     .compoundFees({})
-                                    .accountsPartial({
+                                    .accounts({
                                     poolCompoundingLpVault: poolConfig.compoundingLpVault,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
@@ -5241,6 +5304,7 @@ var PerpetualsClient = (function () {
                                     rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
                                     lpTokenMint: lpTokenMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
@@ -5285,7 +5349,7 @@ var PerpetualsClient = (function () {
                                 .depositTokenStake({
                                 depositAmount: depositAmount
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: owner,
                                 feePayer: feePayer,
                                 fundingTokenAccount: userTokenAccount,
@@ -5295,6 +5359,8 @@ var PerpetualsClient = (function () {
                                 tokenStakeAccount: tokenStakeAccount,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
@@ -5330,10 +5396,11 @@ var PerpetualsClient = (function () {
                                 .unstakeTokenRequest({
                                 unstakeAmount: unstakeAmount
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: owner,
                                 tokenVault: poolConfig.tokenVault,
                                 tokenStakeAccount: tokenStakeAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId
                             })
                                 .instruction()];
@@ -5375,7 +5442,7 @@ var PerpetualsClient = (function () {
                                 .unstakeTokenInstant({
                                 unstakeAmount: unstakeAmount
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: owner,
                                 receivingTokenAccount: userTokenAccount,
                                 perpetuals: poolConfig.perpetuals,
@@ -5384,6 +5451,8 @@ var PerpetualsClient = (function () {
                                 tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
                                 tokenStakeAccount: tokenStakeAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
@@ -5425,7 +5494,7 @@ var PerpetualsClient = (function () {
                                 .withdrawToken({
                                 withdrawRequestId: withdrawRequestId
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: owner,
                                 receivingTokenAccount: userTokenAccount,
                                 perpetuals: this.perpetuals.publicKey,
@@ -5434,6 +5503,8 @@ var PerpetualsClient = (function () {
                                 tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
                                 tokenStakeAccount: tokenStakeAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
@@ -5469,10 +5540,11 @@ var PerpetualsClient = (function () {
                                 .cancelUnstakeTokenRequest({
                                 withdrawRequestId: withdrawRequestId
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: owner,
                                 tokenVault: poolConfig.tokenVault,
                                 tokenStakeAccount: tokenStakeAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId
                             })
                                 .instruction()];
@@ -5524,7 +5596,7 @@ var PerpetualsClient = (function () {
                             }
                             return [4, this.program.methods
                                     .collectTokenReward({})
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: owner,
                                     receivingTokenAccount: userTokenAccount,
                                     perpetuals: this.perpetuals.publicKey,
@@ -5533,6 +5605,8 @@ var PerpetualsClient = (function () {
                                     tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
                                     tokenStakeAccount: tokenStakeAccount,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     tokenMint: poolConfig.tokenMint,
                                 })
                                     .instruction()];
@@ -5586,7 +5660,7 @@ var PerpetualsClient = (function () {
                             }
                             return [4, this.program.methods
                                     .collectRevenue({})
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: owner,
                                     receivingRevenueAccount: userTokenAccount,
                                     perpetuals: this.perpetuals.publicKey,
@@ -5595,6 +5669,8 @@ var PerpetualsClient = (function () {
                                     revenueTokenAccount: poolConfig.revenueTokenAccount,
                                     tokenStakeAccount: tokenStakeAccount,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     receivingTokenMint: rewardCustodyMint,
                                 })
                                     .instruction()];
@@ -5648,7 +5724,7 @@ var PerpetualsClient = (function () {
                             }
                             return [4, this.program.methods
                                     .collectRebate()
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: owner,
                                     receivingTokenAccount: userTokenAccount,
                                     perpetuals: this.perpetuals.publicKey,
@@ -5657,6 +5733,8 @@ var PerpetualsClient = (function () {
                                     rebateTokenAccount: poolConfig.rebateTokenAccount,
                                     tokenStakeAccount: tokenStakeAccount,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     receivingTokenMint: rebateMint,
                                 })
                                     .instruction()];
@@ -5692,7 +5770,7 @@ var PerpetualsClient = (function () {
                         rebateMint = poolConfig.getTokenFromSymbol(rebateSymbol).mintKey;
                         return [4, this.program.methods
                                 .settleRebates()
-                                .accountsPartial({
+                                .accounts({
                                 transferAuthority: poolConfig.transferAuthority,
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
@@ -5703,6 +5781,8 @@ var PerpetualsClient = (function () {
                                 rebateTokenAccount: poolConfig.rebateTokenAccount,
                                 tokenMint: rebateMint,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .instruction()];
@@ -5805,7 +5885,7 @@ var PerpetualsClient = (function () {
                                     stopLossPrice: stopLossPrice,
                                     takeProfitPrice: takeProfitPrice
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     fundingAccount: reserveSymbol == 'SOL' ? wrappedSolAccount.publicKey : userReserveTokenAccount,
@@ -5822,6 +5902,8 @@ var PerpetualsClient = (function () {
                                     receiveCustody: receiveCustodyConfig.custodyAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: reserveCustodyConfig.mintKey,
                                 })
@@ -5911,7 +5993,7 @@ var PerpetualsClient = (function () {
                                     stopLossPrice: stopLossPrice,
                                     takeProfitPrice: takeProfitPrice
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
                                     receivingAccount: reserveSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
@@ -5928,6 +6010,8 @@ var PerpetualsClient = (function () {
                                     reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
                                     receiveCustody: receiveCustodyConfig.custodyAccount,
                                     receivingTokenProgram: poolConfig.getTokenFromSymbol(reserveSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: poolConfig.getTokenFromSymbol(reserveSymbol).mintKey
                                 })
@@ -5978,7 +6062,7 @@ var PerpetualsClient = (function () {
                                     orderId: orderId,
                                     privilege: privilege
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     positionOwner: userPubkey,
                                     feePayer: publicKey,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -5994,6 +6078,8 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey,
                                 })
@@ -6046,7 +6132,7 @@ var PerpetualsClient = (function () {
                                     orderId: orderId,
                                     privilege: privilege
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     positionOwner: userPubkey,
                                     feePayer: publicKey,
                                     transferAuthority: poolConfig.transferAuthority,
@@ -6064,6 +6150,8 @@ var PerpetualsClient = (function () {
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     collateralTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     collateralMint: collateralCustodyConfig.mintKey,
                                 })
@@ -6110,7 +6198,7 @@ var PerpetualsClient = (function () {
                                 deltaSizeAmount: deltaSizeAmount,
                                 isStopLoss: isStopLoss
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: publicKey,
                                 feePayer: publicKey,
                                 perpetuals: poolConfig.perpetuals,
@@ -6124,6 +6212,8 @@ var PerpetualsClient = (function () {
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 receiveCustody: receivingCustodyConfig.custodyAccount,
                                 systemProgram: web3_js_1.SystemProgram.programId,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .instruction()];
@@ -6168,7 +6258,7 @@ var PerpetualsClient = (function () {
                                 deltaSizeAmount: deltaSizeAmount,
                                 isStopLoss: isStopLoss
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: publicKey,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
@@ -6180,6 +6270,8 @@ var PerpetualsClient = (function () {
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 receiveCustody: receivingCustodyConfig.custodyAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .instruction()];
@@ -6220,9 +6312,11 @@ var PerpetualsClient = (function () {
                                 orderId: orderId,
                                 isStopLoss: isStopLoss
                             })
-                                .accountsPartial({
+                                .accounts({
                                 owner: publicKey,
                                 order: orderAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                             })
                                 .instruction()];
                     case 2:
@@ -6260,9 +6354,11 @@ var PerpetualsClient = (function () {
                         positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                         return [4, this.program.methods
                                 .cancelAllTriggerOrders()
-                                .accountsPartial({
+                                .accounts({
                                 position: positionAccount,
                                 order: orderAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                             })
                                 .instruction()];
                     case 2:
@@ -6358,7 +6454,7 @@ var PerpetualsClient = (function () {
                                     orderId: orderId,
                                     privilege: privilege
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     positionOwner: owner,
                                     feePayer: payerPubkey,
                                     receivingAccount: userReceivingTokenAccount,
@@ -6377,6 +6473,8 @@ var PerpetualsClient = (function () {
                                     dispensingCustody: receivingCustodyConfig.custodyAccount,
                                     dispensingOracleAccount: this.useExtOracleAccount ? receivingCustodyConfig.extOracleAccount : receivingCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: receivingCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: receivingCustodyConfig.mintKey,
                                     receivingTokenProgram: receivingToken.isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
@@ -6450,7 +6548,7 @@ var PerpetualsClient = (function () {
                                     orderId: orderId,
                                     privilege: privilege
                                 })
-                                    .accountsPartial({
+                                    .accounts({
                                     feePayer: payerPubkey,
                                     positionOwner: owner,
                                     receivingAccount: userReceivingTokenAccount,
@@ -6466,6 +6564,8 @@ var PerpetualsClient = (function () {
                                     collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     receivingTokenProgram: poolConfig.getTokenFromSymbol(collateralSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     receivingMint: collateralCustodyConfig.mintKey
                                 })
@@ -6673,7 +6773,7 @@ var PerpetualsClient = (function () {
                             };
                             return [4, this.program.methods
                                     .swap(params)
-                                    .accountsPartial({
+                                    .accounts({
                                     owner: publicKey,
                                     fundingAccount: userInputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
                                     receivingAccount: userOutputTokenSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userOutputTokenAccount,
@@ -6687,6 +6787,7 @@ var PerpetualsClient = (function () {
                                     dispensingCustodyOracleAccount: this.useExtOracleAccount ? userOutputCustodyConfig.extOracleAccount : userOutputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                     fundingMint: userInputCustodyConfig.mintKey,
                                     fundingTokenProgram: poolConfig.getTokenFromSymbol(userInputTokenSymbol).isToken2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
@@ -6754,13 +6855,15 @@ var PerpetualsClient = (function () {
                         params = {};
                         return [4, this.program.methods
                                 .swapFeeInternal(params)
-                                .accountsPartial({
+                                .accounts({
                                 owner: publicKey,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
                                 rewardCustody: rewardCustody.custodyAccount,
                                 rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
                                 rewardCustodyTokenAccount: rewardCustody.tokenAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
@@ -6816,7 +6919,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .setLpTokenPrice({})
-                                .accountsPartial({
+                                .accounts({
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
                                 lpTokenMint: poolConfig.stakedLpTokenMint,
@@ -6856,7 +6959,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .init(config)
-                                .accountsPartial({
+                                .accounts({
                                 upgradeAuthority: this.provider.wallet.publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
@@ -6899,7 +7002,7 @@ var PerpetualsClient = (function () {
                                 .setAdminSigners({
                                 minSignatures: minSignatures,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: this.admin,
                                 multisig: this.multisig.publicKey,
                             })
@@ -6936,7 +7039,7 @@ var PerpetualsClient = (function () {
                             maxLpPriceUsd: maxLpPriceUsd,
                             thresholdUsd: thresholdUsd
                         })
-                            .accountsPartial({
+                            .accounts({
                             admin: this.provider.wallet.publicKey,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
@@ -6963,7 +7066,7 @@ var PerpetualsClient = (function () {
                 switch (_a.label) {
                     case 0: return [4, this.program.methods
                             .removePool({})
-                            .accountsPartial({
+                            .accounts({
                             admin: this.admin,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
@@ -6982,7 +7085,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCustody = function (poolName, tokenMint, isToken222, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment, rewardThreshold, minReserveUsd, limitPriceBufferBps) { return __awaiter(_this, void 0, void 0, function () {
+        this.addCustody = function (poolName, tokenMint, isToken222, isStable, isVirtual, oracle, pricing, permissions, fees, borrowRate, ratios, depegAdjustment, rewardThreshold, minReserveUsd, limitPriceBufferBps, inversePrice) { return __awaiter(_this, void 0, void 0, function () {
             var trx_id, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -6993,6 +7096,7 @@ var PerpetualsClient = (function () {
                                 isStable: isStable,
                                 depegAdjustment: depegAdjustment,
                                 isVirtual: isVirtual,
+                                inversePrice: inversePrice,
                                 token22: isToken222,
                                 oracle: oracle,
                                 pricing: pricing,
@@ -7004,7 +7108,7 @@ var PerpetualsClient = (function () {
                                 minReserveUsd: minReserveUsd,
                                 limitPriceBufferBps: limitPriceBufferBps
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: this.admin,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
@@ -7048,7 +7152,7 @@ var PerpetualsClient = (function () {
                             borrowRate: borrowRate,
                             ratios: ratios,
                         })
-                            .accountsPartial({
+                            .accounts({
                             admin: this.admin,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
@@ -7082,7 +7186,7 @@ var PerpetualsClient = (function () {
                         userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMint, this.admin, true);
                         return [4, this.program.methods
                                 .removeCustody({ ratios: ratios })
-                                .accountsPartial({
+                                .accounts({
                                 admin: this.admin,
                                 receivingAccount: userReceivingTokenAccount,
                                 multisig: this.multisig.publicKey,
@@ -7125,7 +7229,7 @@ var PerpetualsClient = (function () {
                         _a.trys.push([2, 4, , 5]);
                         return [4, this.program.methods
                                 .withdrawFees({})
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
@@ -7166,7 +7270,7 @@ var PerpetualsClient = (function () {
                         _a.trys.push([1, 3, , 4]);
                         return [4, this.program.methods
                                 .moveProtocolFees()
-                                .accountsPartial({
+                                .accounts({
                                 transferAuthority: this.authority.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
                                 tokenVault: poolConfig.tokenVault,
@@ -7177,6 +7281,7 @@ var PerpetualsClient = (function () {
                                 protocolVault: poolConfig.protocolVault,
                                 protocolTokenAccount: poolConfig.protocolTokenAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
                                 tokenMint: rewardCustodyConfig.mintKey,
                             })
@@ -7207,7 +7312,7 @@ var PerpetualsClient = (function () {
                                 .setProtocolFeeShare({
                                 feeShareBps: feeShareBps
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 protocolVault: poolConfig.protocolVault,
@@ -7241,7 +7346,7 @@ var PerpetualsClient = (function () {
                                 .setPermissions({
                                 permissions: permissions,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey
@@ -7300,7 +7405,7 @@ var PerpetualsClient = (function () {
                         _g.trys.push([1, 4, , 5]);
                         _e = (_d = this.program.methods
                             .reimburse({ amountIn: amountIn }))
-                            .accountsPartial;
+                            .accounts;
                         _f = {
                             admin: this.provider.wallet.publicKey,
                             multisig: poolConfig.multisig
@@ -7354,7 +7459,7 @@ var PerpetualsClient = (function () {
                                 ema: ema,
                                 publishTime: publishTime,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 authority: poolConfig.backupOracle,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
@@ -7416,7 +7521,7 @@ var PerpetualsClient = (function () {
                                 useCurrentTime: useCurrentTime,
                                 prices: tokenInternalPrices
                             })
-                                .accountsPartial({
+                                .accounts({
                                 authority: POOL_CONFIGS[0].backupOracle,
                             })
                                 .remainingAccounts(__spreadArray([], accountMetas, true))
@@ -7467,7 +7572,7 @@ var PerpetualsClient = (function () {
                                 .setInternalEmaPrice({
                                 prices: tokenInternalEmaPrices
                             })
-                                .accountsPartial({
+                                .accounts({
                                 authority: POOL_CONFIGS[0].backupOracle,
                             })
                                 .remainingAccounts(__spreadArray([], accountMetas, true))
@@ -7501,9 +7606,10 @@ var PerpetualsClient = (function () {
                                 .setPositionPriceImpact({
                                 priceImpactUsd: priceImpactUsd,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 authority: penaltyAuthority,
                                 position: positionPubkey,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
                             })
                                 .instruction()];
@@ -7542,7 +7648,7 @@ var PerpetualsClient = (function () {
                                 lpTokenSymbol: lpTokenSymbol,
                                 lpTokenUri: lpTokenUri,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: poolConfig.transferAuthority,
@@ -7591,7 +7697,7 @@ var PerpetualsClient = (function () {
                                 .initStaking({
                                 stakingFeeShareBps: stakingFeeShareBps
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: poolConfig.transferAuthority,
@@ -7644,7 +7750,7 @@ var PerpetualsClient = (function () {
                                 metadataSymbol: metadataSymbol,
                                 metadataUri: metadataUri
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: poolConfig.transferAuthority,
@@ -7698,7 +7804,7 @@ var PerpetualsClient = (function () {
                                 withdrawInstantFee: withdrawInstantFee,
                                 stakeLevel: stakeLevel,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -7747,7 +7853,7 @@ var PerpetualsClient = (function () {
                                 withdrawInstantFee: withdrawInstantFee,
                                 stakeLevel: stakeLevel,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 tokenVault: poolConfig.tokenVault,
@@ -7792,7 +7898,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .withdrawInstantFees({})
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -7842,7 +7948,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .withdrawUnclaimedTokens({})
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -7887,7 +7993,7 @@ var PerpetualsClient = (function () {
                                 .initRevenueTokenAccount({
                                 feeShareBps: feeShareBps
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -7935,7 +8041,7 @@ var PerpetualsClient = (function () {
                                 .initRebateVault({
                                 allowRebatePayout: allowRebatePayout
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: poolConfig.transferAuthority,
@@ -7984,7 +8090,7 @@ var PerpetualsClient = (function () {
                                 amount: amount,
                                 epochCount: epochCount,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -7993,6 +8099,8 @@ var PerpetualsClient = (function () {
                                 tokenVault: poolConfig.tokenVault,
                                 tokenVaultTokenAccount: poolConfig.tokenVaultTokenAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
                                 tokenMint: poolConfig.tokenMint,
                             })
                                 .instruction()];
@@ -8011,7 +8119,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.setTokenStakeLevel = function (owner, stakeLevel) { return __awaiter(_this, void 0, void 0, function () {
+        this.setTokenStakeLevel = function (owner, stakeLevel, isInitialized) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_63;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -8028,8 +8136,9 @@ var PerpetualsClient = (function () {
                         return [4, this.program.methods
                                 .setTokenStakeLevel({
                                 level: stakeLevel,
+                                init: isInitialized,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 tokenStakeAccount: tokenStakeAccount,
@@ -8069,11 +8178,12 @@ var PerpetualsClient = (function () {
                                 amount: amount,
                                 epochCount: epochCount,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 tokenVault: poolConfig.tokenVault,
                                 tokenStakeAccount: tokenStakeAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId
                             })
                                 .instruction()];
@@ -8109,7 +8219,7 @@ var PerpetualsClient = (function () {
                                 .resizeInternalOracle({
                                 extOracle: extOracle
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 custodyTokenMint: tokenMint,
@@ -8153,7 +8263,7 @@ var PerpetualsClient = (function () {
                                 isWithdrawalFeeExempt: isWithdrawalFeeExempt,
                                 poolAddress: poolAddress,
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 owner: owner,
@@ -8197,7 +8307,7 @@ var PerpetualsClient = (function () {
                                 isWithdrawalFeeExempt: isWithdrawalFeeExempt,
                                 poolAddress: poolAddress
                             })
-                                .accountsPartial({
+                                .accounts({
                                 admin: publicKey,
                                 multisig: this.multisig.publicKey,
                                 owner: owner,
@@ -8222,9 +8332,7 @@ var PerpetualsClient = (function () {
         }); };
         this.provider = provider;
         (0, anchor_1.setProvider)(provider);
-        this.program = new anchor_1.Program(perpetuals_json_1.default, {
-            connection: provider.connection,
-        });
+        this.program = new anchor_1.Program(perpetuals_1.IDL, programId);
         this.programId = programId;
         this.admin = this.provider.wallet.publicKey;
         this.multisig = this.findProgramAddress("multisig");