flash-sdk 2.46.6 → 2.46.7

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.");
@@ -2149,146 +2149,160 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.getAddLiquidityAmountAndFeeView = function (amount, poolKey, depositCustodyKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_5, token, _a, custodies_6, custody, _b, _c, market, depositCustodyConfig, transaction, backUpOracleInstruction, 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_5 = custodies; _i < custodies_5.length; _i++) {
-                            token = custodies_5[_i];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: token.custodyAccount,
-                            });
-                        }
-                        for (_a = 0, custodies_6 = custodies; _a < custodies_6.length; _a++) {
-                            custody = custodies_6[_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,
-                            });
-                        }
-                        depositCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(depositCustodyKey); });
-                        return [4, this.program.methods
-                                .getAddLiquidityAmountAndFee({
-                                amountIn: amount,
-                            })
-                                .accounts({
-                                perpetuals: POOL_CONFIG.perpetuals,
-                                pool: poolKey,
-                                custody: depositCustodyKey,
-                                custodyOracleAccount: depositCustodyConfig.intOracleAccount,
-                                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();
-                        (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
-                        return [4, this.viewHelper.simulateTransaction(transaction)];
-                    case 3:
-                        result = _e.sent();
-                        index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddLiquidityAmountAndFee'; });
-                        res = this.viewHelper.decodeLogs(result, index, 'getAddLiquidityAmountAndFee');
-                        return [2, {
-                                amount: res.amount,
-                                fee: res.fee,
-                            }];
-                }
+        this.getAddLiquidityAmountAndFeeView = function (amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1) {
+            var args_1 = [];
+            for (var _i = 4; _i < arguments.length; _i++) {
+                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) {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_5, token, _b, custodies_6, custody, _c, _d, market, depositCustodyConfig, transaction, backUpOracleInstruction, result, index, res;
+                var _e;
+                if (userPublicKey === void 0) { userPublicKey = undefined; }
+                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_5 = custodies; _a < custodies_5.length; _a++) {
+                                token = custodies_5[_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];
+                                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,
+                                });
+                            }
+                            depositCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(depositCustodyKey); });
+                            return [4, this.program.methods
+                                    .getAddLiquidityAmountAndFee({
+                                    amountIn: amount,
+                                })
+                                    .accounts({
+                                    perpetuals: POOL_CONFIG.perpetuals,
+                                    pool: poolKey,
+                                    custody: depositCustodyKey,
+                                    custodyOracleAccount: depositCustodyConfig.intOracleAccount,
+                                    lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
+                                    .transaction()];
+                        case 1:
+                            transaction = _f.sent();
+                            return [4, backUpOracleInstructionPromise];
+                        case 2:
+                            backUpOracleInstruction = _f.sent();
+                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
+                        case 3:
+                            result = _f.sent();
+                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddLiquidityAmountAndFee'; });
+                            res = this.viewHelper.decodeLogs(result, index, 'getAddLiquidityAmountAndFee');
+                            return [2, {
+                                    amount: res.amount,
+                                    fee: res.fee,
+                                }];
+                    }
+                });
             });
-        }); };
-        this.getRemoveLiquidityAmountAndFeeView = function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_7, token, _a, custodies_8, custody, _b, _c, market, removeCustodyConfig, transaction, backUpOracleInstruction, 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_7 = custodies; _i < custodies_7.length; _i++) {
-                            token = custodies_7[_i];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: token.custodyAccount,
-                            });
-                        }
-                        for (_a = 0, custodies_8 = custodies; _a < custodies_8.length; _a++) {
-                            custody = custodies_8[_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,
-                            });
-                        }
-                        removeCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(removeTokenCustodyKey); });
-                        return [4, this.program.methods
-                                .getRemoveLiquidityAmountAndFee({
-                                lpAmountIn: amount,
-                            })
-                                .accounts({
-                                perpetuals: POOL_CONFIG.perpetuals,
-                                pool: poolKey,
-                                custody: removeTokenCustodyKey,
-                                custodyOracleAccount: removeCustodyConfig.intOracleAccount,
-                                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();
-                        (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
-                        return [4, this.viewHelper.simulateTransaction(transaction)];
-                    case 3:
-                        result = _e.sent();
-                        index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveLiquidityAmountAndFee'; });
-                        if (result.value.err) {
+        };
+        this.getRemoveLiquidityAmountAndFeeView = function (amount_1, poolKey_1, removeTokenCustodyKey_1, POOL_CONFIG_1) {
+            var args_1 = [];
+            for (var _i = 4; _i < arguments.length; _i++) {
+                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) {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_7, token, _b, custodies_8, custody, _c, _d, market, removeCustodyConfig, transaction, backUpOracleInstruction, result, index, res;
+                var _e;
+                if (userPublicKey === void 0) { userPublicKey = undefined; }
+                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_7 = custodies; _a < custodies_7.length; _a++) {
+                                token = custodies_7[_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];
+                                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,
+                                });
+                            }
+                            removeCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(removeTokenCustodyKey); });
+                            return [4, this.program.methods
+                                    .getRemoveLiquidityAmountAndFee({
+                                    lpAmountIn: amount,
+                                })
+                                    .accounts({
+                                    perpetuals: POOL_CONFIG.perpetuals,
+                                    pool: poolKey,
+                                    custody: removeTokenCustodyKey,
+                                    custodyOracleAccount: removeCustodyConfig.intOracleAccount,
+                                    lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
+                                    .transaction()];
+                        case 1:
+                            transaction = _f.sent();
+                            return [4, backUpOracleInstructionPromise];
+                        case 2:
+                            backUpOracleInstruction = _f.sent();
+                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
+                        case 3:
+                            result = _f.sent();
+                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveLiquidityAmountAndFee'; });
+                            if (result.value.err) {
+                                return [2, {
+                                        amount: new anchor_1.BN(0),
+                                        fee: new anchor_1.BN(0),
+                                    }];
+                            }
+                            res = this.viewHelper.decodeLogs(result, index, 'getRemoveLiquidityAmountAndFee');
                             return [2, {
-                                    amount: new anchor_1.BN(0),
-                                    fee: new anchor_1.BN(0),
+                                    amount: res.amount,
+                                    fee: res.fee,
                                 }];
-                        }
-                        res = this.viewHelper.decodeLogs(result, index, 'getRemoveLiquidityAmountAndFee');
-                        return [2, {
-                                amount: res.amount,
-                                fee: res.fee,
-                            }];
-                }
+                    }
+                });
             });
-        }); };
+        };
         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, result, index, res;
             var _d;
@@ -2348,154 +2362,168 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.getAddCompoundingLiquidityAmountAndFeeView = function (amount, poolKey, depositCustodyKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_11, token, _a, custodies_12, custody, _b, _c, market, depositCustodyConfig, rewardCustody, backUpOracleInstruction, transaction, 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_11 = custodies; _i < custodies_11.length; _i++) {
-                            token = custodies_11[_i];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: token.custodyAccount,
-                            });
-                        }
-                        for (_a = 0, custodies_12 = custodies; _a < custodies_12.length; _a++) {
-                            custody = custodies_12[_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,
-                            });
-                        }
-                        depositCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(depositCustodyKey); });
-                        rewardCustody = POOL_CONFIG.custodies.find(function (f) { return f.symbol == 'USDC'; });
-                        return [4, backUpOracleInstructionPromise];
-                    case 1:
-                        backUpOracleInstruction = _e.sent();
-                        return [4, this.program.methods
-                                .getAddCompoundingLiquidityAmountAndFee({
-                                amountIn: amount,
-                            })
-                                .accounts({
-                                perpetuals: POOL_CONFIG.perpetuals,
-                                pool: poolKey,
-                                inCustody: depositCustodyKey,
-                                inCustodyOracleAccount: depositCustodyConfig.intOracleAccount,
-                                rewardCustody: rewardCustody.custodyAccount,
-                                rewardCustodyOracleAccount: rewardCustody.intOracleAccount,
-                                lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
-                                compoundingTokenMint: POOL_CONFIG.compoundingTokenMint,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
-                                .transaction()];
-                    case 2:
-                        transaction = _e.sent();
-                        (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
-                        return [4, this.viewHelper.simulateTransaction(transaction)];
-                    case 3:
-                        result = _e.sent();
-                        index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddCompoundingLiquidityAmountAndFee'; });
-                        res = this.viewHelper.decodeLogs(result, index, 'getAddCompoundingLiquidityAmountAndFee');
-                        return [2, {
-                                amount: res.amount,
-                                fee: res.fee,
-                            }];
-                }
+        this.getAddCompoundingLiquidityAmountAndFeeView = function (amount_1, poolKey_1, depositCustodyKey_1, POOL_CONFIG_1) {
+            var args_1 = [];
+            for (var _i = 4; _i < arguments.length; _i++) {
+                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) {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_11, token, _b, custodies_12, custody, _c, _d, market, depositCustodyConfig, rewardCustody, backUpOracleInstruction, transaction, result, index, res;
+                var _e;
+                if (userPublicKey === void 0) { userPublicKey = undefined; }
+                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_11 = custodies; _a < custodies_11.length; _a++) {
+                                token = custodies_11[_a];
+                                custodyMetas.push({
+                                    isSigner: false,
+                                    isWritable: false,
+                                    pubkey: token.custodyAccount,
+                                });
+                            }
+                            for (_b = 0, custodies_12 = custodies; _b < custodies_12.length; _b++) {
+                                custody = custodies_12[_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,
+                                });
+                            }
+                            depositCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(depositCustodyKey); });
+                            rewardCustody = POOL_CONFIG.custodies.find(function (f) { return f.symbol == 'USDC'; });
+                            return [4, backUpOracleInstructionPromise];
+                        case 1:
+                            backUpOracleInstruction = _f.sent();
+                            return [4, this.program.methods
+                                    .getAddCompoundingLiquidityAmountAndFee({
+                                    amountIn: amount,
+                                })
+                                    .accounts({
+                                    perpetuals: POOL_CONFIG.perpetuals,
+                                    pool: poolKey,
+                                    inCustody: depositCustodyKey,
+                                    inCustodyOracleAccount: depositCustodyConfig.intOracleAccount,
+                                    rewardCustody: rewardCustody.custodyAccount,
+                                    rewardCustodyOracleAccount: rewardCustody.intOracleAccount,
+                                    lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
+                                    compoundingTokenMint: POOL_CONFIG.compoundingTokenMint,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
+                                    .transaction()];
+                        case 2:
+                            transaction = _f.sent();
+                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
+                        case 3:
+                            result = _f.sent();
+                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddCompoundingLiquidityAmountAndFee'; });
+                            res = this.viewHelper.decodeLogs(result, index, 'getAddCompoundingLiquidityAmountAndFee');
+                            return [2, {
+                                    amount: res.amount,
+                                    fee: res.fee,
+                                }];
+                    }
+                });
             });
-        }); };
-        this.getRemoveCompoundingLiquidityAmountAndFeeView = function (amount, poolKey, removeTokenCustodyKey, POOL_CONFIG) { return __awaiter(_this, void 0, void 0, function () {
-            var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _i, custodies_13, token, _a, custodies_14, custody, _b, _c, market, removeCustodyConfig, rewardCustody, backUpOracleInstruction, transaction, 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_13 = custodies; _i < custodies_13.length; _i++) {
-                            token = custodies_13[_i];
-                            custodyMetas.push({
-                                isSigner: false,
-                                isWritable: false,
-                                pubkey: token.custodyAccount,
-                            });
-                        }
-                        for (_a = 0, custodies_14 = custodies; _a < custodies_14.length; _a++) {
-                            custody = custodies_14[_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,
-                            });
-                        }
-                        removeCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(removeTokenCustodyKey); });
-                        rewardCustody = POOL_CONFIG.custodies.find(function (f) { return f.symbol == 'USDC'; });
-                        return [4, backUpOracleInstructionPromise];
-                    case 1:
-                        backUpOracleInstruction = _e.sent();
-                        return [4, this.program.methods
-                                .getRemoveCompoundingLiquidityAmountAndFee({
-                                compoundingAmountIn: amount,
-                            })
-                                .accounts({
-                                perpetuals: POOL_CONFIG.perpetuals,
-                                pool: poolKey,
-                                outCustody: removeTokenCustodyKey,
-                                outCustodyOracleAccount: removeCustodyConfig.intOracleAccount,
-                                rewardCustody: rewardCustody.custodyAccount,
-                                rewardCustodyOracleAccount: rewardCustody.intOracleAccount,
-                                compoundingTokenMint: POOL_CONFIG.compoundingTokenMint,
-                                lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
-                                .transaction()];
-                    case 2:
-                        transaction = _e.sent();
-                        (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
-                        return [4, this.viewHelper.simulateTransaction(transaction)];
-                    case 3:
-                        result = _e.sent();
-                        index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveCompoundingLiquidityAmountAndFee'; });
-                        if (result.value.err) {
+        };
+        this.getRemoveCompoundingLiquidityAmountAndFeeView = function (amount_1, poolKey_1, removeTokenCustodyKey_1, POOL_CONFIG_1) {
+            var args_1 = [];
+            for (var _i = 4; _i < arguments.length; _i++) {
+                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) {
+                var backUpOracleInstructionPromise, custodies, custodyMetas, marketMetas, _a, custodies_13, token, _b, custodies_14, custody, _c, _d, market, removeCustodyConfig, rewardCustody, backUpOracleInstruction, transaction, result, index, res;
+                var _e;
+                if (userPublicKey === void 0) { userPublicKey = undefined; }
+                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_13 = custodies; _a < custodies_13.length; _a++) {
+                                token = custodies_13[_a];
+                                custodyMetas.push({
+                                    isSigner: false,
+                                    isWritable: false,
+                                    pubkey: token.custodyAccount,
+                                });
+                            }
+                            for (_b = 0, custodies_14 = custodies; _b < custodies_14.length; _b++) {
+                                custody = custodies_14[_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,
+                                });
+                            }
+                            removeCustodyConfig = custodies.find(function (i) { return i.custodyAccount.equals(removeTokenCustodyKey); });
+                            rewardCustody = POOL_CONFIG.custodies.find(function (f) { return f.symbol == 'USDC'; });
+                            return [4, backUpOracleInstructionPromise];
+                        case 1:
+                            backUpOracleInstruction = _f.sent();
+                            return [4, this.program.methods
+                                    .getRemoveCompoundingLiquidityAmountAndFee({
+                                    compoundingAmountIn: amount,
+                                })
+                                    .accounts({
+                                    perpetuals: POOL_CONFIG.perpetuals,
+                                    pool: poolKey,
+                                    outCustody: removeTokenCustodyKey,
+                                    outCustodyOracleAccount: removeCustodyConfig.intOracleAccount,
+                                    rewardCustody: rewardCustody.custodyAccount,
+                                    rewardCustodyOracleAccount: rewardCustody.intOracleAccount,
+                                    compoundingTokenMint: POOL_CONFIG.compoundingTokenMint,
+                                    lpTokenMint: POOL_CONFIG.stakedLpTokenMint,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyMetas, true), marketMetas, true))
+                                    .transaction()];
+                        case 2:
+                            transaction = _f.sent();
+                            (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
+                            return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
+                        case 3:
+                            result = _f.sent();
+                            index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveCompoundingLiquidityAmountAndFee'; });
+                            if (result.value.err) {
+                                return [2, {
+                                        amount: new anchor_1.BN(0),
+                                        fee: new anchor_1.BN(0),
+                                    }];
+                            }
+                            res = this.viewHelper.decodeLogs(result, index, 'getRemoveCompoundingLiquidityAmountAndFee');
                             return [2, {
-                                    amount: new anchor_1.BN(0),
-                                    fee: new anchor_1.BN(0),
+                                    amount: res.amount,
+                                    fee: res.fee,
                                 }];
-                        }
-                        res = this.viewHelper.decodeLogs(result, index, 'getRemoveCompoundingLiquidityAmountAndFee');
-                        return [2, {
-                                amount: res.amount,
-                                fee: res.fee,
-                            }];
-                }
+                    }
+                });
             });
-        }); };
+        };
         this.getLiquidationStateView = function (positionAccount, poolName, tokenMint, collateralMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var targetCustodyConfig, collateralCustodyConfig;
             return __generator(this, function (_a) {
@@ -4111,14 +4139,15 @@ 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) {
+            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) {
                 var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, flpStakeAccount, poolStakedLpVault, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _c, _d, custody, _e, _f, market, instruction;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+                if (userPublicKey === void 0) { userPublicKey = undefined; }
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
-                            publicKey = this.provider.wallet.publicKey;
+                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
@@ -4245,12 +4274,13 @@ 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) {
+            return __awaiter(_this, __spreadArray([recieveTokenSymbol_1, liquidityAmountIn_1, minTokenAmountOut_1, poolConfig_1], args_1, true), void 0, function (recieveTokenSymbol, liquidityAmountIn, minTokenAmountOut, poolConfig, closeLpATA, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey, userPublicKey) {
                 var recieveTokenCustodyConfig, publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, stakedLpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, _e, removeLiquidityTx, closeInx, closeWsolATAIns, err_7;
                 if (closeLpATA === void 0) { closeLpATA = false; }
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+                if (userPublicKey === void 0) { userPublicKey = undefined; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -4258,7 +4288,7 @@ var PerpetualsClient = (function () {
                             if (!recieveTokenCustodyConfig) {
                                 throw "recieveTokenCustody not found";
                             }
-                            publicKey = this.provider.wallet.publicKey;
+                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
@@ -4778,61 +4808,68 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.refreshStakeWithTokenStake = function (rewardSymbol, poolConfig, flpStakeAccountPk) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _i, _a, custody, stakeAccountMetas, tokenStakeAccount, refreshStakeInstruction, err_16;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 2, , 3]);
-                        publicKey = this.provider.wallet.publicKey;
-                        rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
-                        rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
-                        pool = poolConfig.poolAddress;
-                        feeDistributionTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("custody_token_account"), pool.toBuffer(), rewardCustodyMint.toBuffer()], this.programId)[0];
-                        custodyAccountMetas = [];
-                        for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
-                            custody = _a[_i];
-                            custodyAccountMetas.push({
-                                pubkey: custody.custodyAccount,
+        this.refreshStakeWithTokenStake = function (rewardSymbol_1, poolConfig_1, flpStakeAccountPk_1) {
+            var args_1 = [];
+            for (var _i = 3; _i < arguments.length; _i++) {
+                args_1[_i - 3] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([rewardSymbol_1, poolConfig_1, flpStakeAccountPk_1], args_1, true), void 0, function (rewardSymbol, poolConfig, flpStakeAccountPk, userPublicKey) {
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, pool, feeDistributionTokenAccount, custodyAccountMetas, _a, _b, custody, stakeAccountMetas, tokenStakeAccount, refreshStakeInstruction, err_16;
+                if (userPublicKey === void 0) { userPublicKey = undefined; }
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            _c.trys.push([0, 2, , 3]);
+                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
+                            rewardCustodyMint = poolConfig.getTokenFromSymbol(rewardSymbol).mintKey;
+                            rewardCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardSymbol).mintKey); });
+                            pool = poolConfig.poolAddress;
+                            feeDistributionTokenAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("custody_token_account"), pool.toBuffer(), rewardCustodyMint.toBuffer()], this.programId)[0];
+                            custodyAccountMetas = [];
+                            for (_a = 0, _b = poolConfig.custodies; _a < _b.length; _a++) {
+                                custody = _b[_a];
+                                custodyAccountMetas.push({
+                                    pubkey: custody.custodyAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            stakeAccountMetas = [];
+                            stakeAccountMetas.push({
+                                pubkey: flpStakeAccountPk,
+                                isSigner: false,
+                                isWritable: true,
+                            });
+                            tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), publicKey.toBuffer()], this.programId)[0];
+                            stakeAccountMetas.push({
+                                pubkey: tokenStakeAccount,
                                 isSigner: false,
                                 isWritable: false,
                             });
-                        }
-                        stakeAccountMetas = [];
-                        stakeAccountMetas.push({
-                            pubkey: flpStakeAccountPk,
-                            isSigner: false,
-                            isWritable: true,
-                        });
-                        tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), publicKey.toBuffer()], this.programId)[0];
-                        stakeAccountMetas.push({
-                            pubkey: tokenStakeAccount,
-                            isSigner: false,
-                            isWritable: false,
-                        });
-                        return [4, this.program.methods
-                                .refreshStake({})
-                                .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))
-                                .instruction()];
-                    case 1:
-                        refreshStakeInstruction = _b.sent();
-                        return [2, refreshStakeInstruction];
-                    case 2:
-                        err_16 = _b.sent();
-                        console.log("perpClient refreshStaking error:: ", err_16);
-                        throw err_16;
-                    case 3: return [2];
-                }
+                            return [4, this.program.methods
+                                    .refreshStake({})
+                                    .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))
+                                    .instruction()];
+                        case 1:
+                            refreshStakeInstruction = _c.sent();
+                            return [2, refreshStakeInstruction];
+                        case 2:
+                            err_16 = _c.sent();
+                            console.log("perpClient refreshStaking error:: ", err_16);
+                            throw err_16;
+                        case 3: return [2];
+                    }
+                });
             });
-        }); };
+        };
         this.unstakeInstant = function (rewardSymbol, unstakeAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, pool, flpStakeAccount, tokenStakeAccount, tokenStakeAccounts, _a, unstakeInstantInstruction, err_17;
             return __generator(this, function (_b) {
@@ -7276,14 +7313,15 @@ 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) {
+            return __awaiter(_this, __spreadArray([amountIn_1, minCompoundingAmountOut_1, inTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig, skipBalanceChecks, ephemeralSignerPubkey, userPublicKey) {
                 var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _a, _b, custody, _c, _d, market, lamports, unWrappedSolBalance, _e, addCompoundingLiquidity, err_58;
                 if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+                if (userPublicKey === void 0) { userPublicKey = undefined; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
-                            publicKey = this.provider.wallet.publicKey;
+                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
                             additionalSigners = [];
@@ -7418,14 +7456,15 @@ 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) {
+            return __awaiter(_this, __spreadArray([compoundingAmountIn_1, minAmountOut_1, outTokenSymbol_1, rewardTokenMint_1, poolConfig_1], args_1, true), void 0, function (compoundingAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA, ephemeralSignerPubkey, userPublicKey) {
                 var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _b, _c, custody, _d, _e, market, compoundingTokenAccount, removeCompoundingLiquidity, err_59;
                 if (createUserATA === void 0) { createUserATA = true; }
                 if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+                if (userPublicKey === void 0) { userPublicKey = undefined; }
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
-                            publicKey = this.provider.wallet.publicKey;
+                            publicKey = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];