flash-sdk 11.10.1-alpha.0 → 11.11.0

package/dist/PerpetualsClient.js

@@ -83,46 +83,34 @@ var PerpetualsClient = (function () {
         if (useExtOracleAccount === void 0) { useExtOracleAccount = false; }
         var _this = this;
         var _a;
-        this.addressLookupTables = [];
         this.poolAddressLookupTables = new Map();
         this.poolPusherAddressLookupTables = new Map();
         this.setPrioritizationFee = function (fee) {
             _this.prioritizationFee = fee;
         };
         this.loadAddressLookupTable = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var addresses, _i, _a, address, addressLookupTable, _b, accCreationLamports;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        addresses = [];
-                        _i = 0, _a = poolConfig.addressLookupTableAddresses;
-                        _c.label = 1;
+            var addressLookupTables, _a, accCreationLamports;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4, this.getOrLoadAddressLookupTable(poolConfig)];
                     case 1:
-                        if (!(_i < _a.length)) return [3, 4];
-                        address = _a[_i];
-                        return [4, this.provider.connection.getAddressLookupTable(address)];
+                        addressLookupTables = (_b.sent()).addressLookupTables;
+                        if (!(!this.pusherAddressLookupTables || this.pusherAddressLookupTables.isActive() === false)) return [3, 3];
+                        _a = this;
+                        return [4, this.provider.connection.getAddressLookupTable(poolConfig.pusherAddressLookupTableAddress)];
                     case 2:
-                        addressLookupTable = (_c.sent()).value;
-                        if (addressLookupTable) {
-                            addresses.push(addressLookupTable);
-                        }
-                        _c.label = 3;
+                        _a.pusherAddressLookupTables = (_b.sent()).value;
+                        _b.label = 3;
                     case 3:
-                        _i++;
-                        return [3, 1];
-                    case 4:
-                        this.addressLookupTables = addresses;
-                        _b = this;
-                        return [4, this.provider.connection.getAddressLookupTable(poolConfig.pusherAddressLookupTableAddress)];
-                    case 5:
-                        _b.pusherAddressLookupTables = (_c.sent()).value;
+                        if (!!this.minimumBalanceForRentExemptAccountLamports) return [3, 5];
                         return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                    case 6:
-                        accCreationLamports = (_c.sent());
+                    case 4:
+                        accCreationLamports = (_b.sent());
                         if (accCreationLamports) {
                             this.minimumBalanceForRentExemptAccountLamports = accCreationLamports;
                         }
-                        return [2];
+                        _b.label = 5;
+                    case 5: return [2];
                 }
             });
         }); };
@@ -701,7 +689,7 @@ var PerpetualsClient = (function () {
                 currentMarginUsd = positionAccount.collateralUsd.sub(lossUsd);
             }
             else {
-                currentMarginUsd = positionAccount.collateralUsd.add(pnl.finalProfitUsd).sub(lossUsd);
+                currentMarginUsd = positionAccount.collateralUsd.add(pnl.profitUsd).sub(lossUsd);
             }
             if (currentMarginUsd.gt(constants_1.BN_ZERO)) {
                 return positionAccount.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentMarginUsd);
@@ -1056,7 +1044,7 @@ var PerpetualsClient = (function () {
             var totalFeesUsd = (exitFeeUsd.add(lockAndUnsettledFeeUsd));
             var currentCollateralUsd = positionDelta.collateralUsd;
             var liabilityUsd = newPnl.lossUsd.add(totalFeesUsd);
-            var assetsUsd = anchor_1.BN.min(newPnl.finalProfitUsd.add(currentCollateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionDelta.lockedAmount, collateralCustodyAccount.decimals));
+            var assetsUsd = anchor_1.BN.min(newPnl.profitUsd.add(currentCollateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionDelta.lockedAmount, collateralCustodyAccount.decimals));
             if (debugLogs) {
                 console.log("assetsUsd.sub(liabilityUsd):", collateralCustodyAccount.decimals, assetsUsd.toString(), liabilityUsd.toString(), assetsUsd.sub(liabilityUsd).toString());
             }
@@ -1193,7 +1181,7 @@ var PerpetualsClient = (function () {
             var exitPriceAndFee = _this.getExitPriceAndFeeSync(positionAccount, marketCorrelation, positionAccount.collateralAmount, positionAccount.sizeAmount, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
             var totalFeesUsd = (exitPriceAndFee.exitFeeUsd.add(exitPriceAndFee.borrowFeeUsd));
             var liabilityUsd = newPnl.lossUsd.add(totalFeesUsd);
-            var assetsUsd = anchor_1.BN.min(newPnl.finalProfitUsd.add(positionAccount.collateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionAccount.lockedAmount, collateralCustodyAccount.decimals));
+            var assetsUsd = anchor_1.BN.min(newPnl.profitUsd.add(positionAccount.collateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionAccount.lockedAmount, collateralCustodyAccount.decimals));
             var closeAmountUsd, feesAmountUsd;
             if (assetsUsd.gt(liabilityUsd)) {
                 closeAmountUsd = assetsUsd.sub(liabilityUsd);
@@ -1609,8 +1597,6 @@ var PerpetualsClient = (function () {
                 return {
                     profitUsd: constants_1.BN_ZERO,
                     lossUsd: constants_1.BN_ZERO,
-                    penaltyUsd: constants_1.BN_ZERO,
-                    finalProfitUsd: constants_1.BN_ZERO,
                 };
             }
             var side = poolConfig.getMarketConfigByPk(positionAccount.market).side;
@@ -1674,34 +1660,16 @@ var PerpetualsClient = (function () {
             if (!priceDiffProfit.exponent.eq(priceDiffLoss.exponent)) {
                 throw new Error("exponent mistach");
             }
-            var totalPenaltyBps = positionAccount.oraclePenalty + positionAccount.previousPenalty;
             if (priceDiffProfit.price.gt(constants_1.BN_ZERO)) {
-                var grossProfitUsd = priceDiffProfit.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals);
-                var penaltyUsd = constants_1.BN_ZERO;
-                var finalProfitUsd = grossProfitUsd;
-                if (totalPenaltyBps > 0 && grossProfitUsd.gt(constants_1.BN_ZERO)) {
-                    penaltyUsd = grossProfitUsd.muln(totalPenaltyBps).divn(constants_1.BPS_POWER);
-                    if (penaltyUsd.gte(grossProfitUsd)) {
-                        penaltyUsd = grossProfitUsd;
-                        finalProfitUsd = constants_1.BN_ZERO;
-                    }
-                    else {
-                        finalProfitUsd = grossProfitUsd.sub(penaltyUsd);
-                    }
-                }
                 return {
-                    profitUsd: grossProfitUsd,
+                    profitUsd: priceDiffProfit.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
                     lossUsd: constants_1.BN_ZERO,
-                    penaltyUsd: penaltyUsd,
-                    finalProfitUsd: finalProfitUsd,
                 };
             }
             else {
                 return {
                     profitUsd: constants_1.BN_ZERO,
                     lossUsd: priceDiffLoss.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
-                    penaltyUsd: constants_1.BN_ZERO,
-                    finalProfitUsd: constants_1.BN_ZERO,
                 };
             }
         };
@@ -1714,7 +1682,7 @@ var PerpetualsClient = (function () {
                     timestamp: constants_1.BN_ZERO
                 });
                 return {
-                    pnl: { profitUsd: constants_1.BN_ZERO, lossUsd: constants_1.BN_ZERO, penaltyUsd: constants_1.BN_ZERO, finalProfitUsd: constants_1.BN_ZERO },
+                    pnl: { profitUsd: constants_1.BN_ZERO, lossUsd: constants_1.BN_ZERO },
                     leverage: constants_1.BN_ZERO,
                     liquidationPrice: zeroOraclePrice,
                     fees: { exitFeeUsd: constants_1.BN_ZERO, exitFeeAmount: constants_1.BN_ZERO, lockAndUnsettledFeeUsd: constants_1.BN_ZERO }
@@ -1780,40 +1748,22 @@ var PerpetualsClient = (function () {
                     priceDiffLoss = new OraclePrice_1.OraclePrice({ price: exitOraclePrice.price.sub(entryOraclePrice.price), exponent: exitOraclePrice.exponent, confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
                 }
             }
-            var totalPenaltyBps = positionAccount.oraclePenalty + positionAccount.previousPenalty;
             if (priceDiffProfit.price.gt(constants_1.BN_ZERO)) {
-                var grossProfitUsd = priceDiffProfit.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals);
-                var penaltyUsd = constants_1.BN_ZERO;
-                var finalProfitUsd = grossProfitUsd;
-                if (totalPenaltyBps > 0 && grossProfitUsd.gt(constants_1.BN_ZERO)) {
-                    penaltyUsd = grossProfitUsd.muln(totalPenaltyBps).divn(constants_1.BPS_POWER);
-                    if (penaltyUsd.gte(grossProfitUsd)) {
-                        penaltyUsd = grossProfitUsd;
-                        finalProfitUsd = constants_1.BN_ZERO;
-                    }
-                    else {
-                        finalProfitUsd = grossProfitUsd.sub(penaltyUsd);
-                    }
-                }
                 pnl = {
-                    profitUsd: grossProfitUsd,
+                    profitUsd: priceDiffProfit.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
                     lossUsd: constants_1.BN_ZERO,
-                    penaltyUsd: penaltyUsd,
-                    finalProfitUsd: finalProfitUsd,
                 };
             }
             else {
                 pnl = {
                     profitUsd: constants_1.BN_ZERO,
                     lossUsd: priceDiffLoss.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
-                    penaltyUsd: constants_1.BN_ZERO,
-                    finalProfitUsd: constants_1.BN_ZERO,
                 };
             }
             var liquidationPrice = _this.getLiquidationPriceContractHelper(entryOraclePrice, lockAndUnsettledFeeUsd, side, targetCustodyAccount, positionAccount);
             var unsettledFeesUsd = exitFeeUsd.add(lockAndUnsettledFeeUsd);
             var lossUsd = pnl.lossUsd.add(unsettledFeesUsd);
-            var currentMarginUsd = positionAccount.collateralUsd.add(pnl.finalProfitUsd).sub(lossUsd);
+            var currentMarginUsd = positionAccount.collateralUsd.add(pnl.profitUsd).sub(lossUsd);
             var leverage;
             if (currentMarginUsd.gt(constants_1.BN_ZERO)) {
                 leverage = positionAccount.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentMarginUsd);
@@ -2060,7 +2010,7 @@ 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, result, index, res;
+            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) {
@@ -2111,8 +2061,11 @@ var PerpetualsClient = (function () {
                         setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
                         transaction.instructions.unshift(setCULimitIx);
                         (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
-                        return [4, this.viewHelper.simulateTransaction(transaction)];
+                        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_1.IDL.instructions.findIndex(function (f) { return f.name === 'getLpTokenPrice'; });
                         res = this.viewHelper.decodeLogs(result, index, 'getLpTokenPrice');
@@ -2176,7 +2129,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, result, index, res;
+                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 _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
@@ -2241,8 +2194,11 @@ var PerpetualsClient = (function () {
                             backUpOracleInstruction = _f.sent();
                             (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
                             _f.label = 3;
-                        case 3: return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
+                        case 3: return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
                         case 4:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
+                        case 5:
                             result = _f.sent();
                             if (result.value.err) {
                                 console.error('error Simulation failed:::', result);
@@ -2268,7 +2224,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, result, index, res;
+                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 _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
@@ -2333,8 +2289,11 @@ var PerpetualsClient = (function () {
                             backUpOracleInstruction = _f.sent();
                             (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
                             _f.label = 3;
-                        case 3: return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
+                        case 3: return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
                         case 4:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
+                        case 5:
                             result = _f.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveLiquidityAmountAndFee'; });
                             if (result.value.err) {
@@ -2355,7 +2314,7 @@ 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, result, index, res;
+            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) {
@@ -2406,8 +2365,11 @@ var PerpetualsClient = (function () {
                         setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
                         transaction.instructions.unshift(setCULimitIx);
                         (_d = transaction.instructions).unshift.apply(_d, backUpOracleInstruction);
-                        return [4, this.viewHelper.simulateTransaction(transaction)];
+                        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_1.IDL.instructions.findIndex(function (f) { return f.name === 'getCompoundingTokenPrice'; });
                         res = this.viewHelper.decodeLogs(result, index, 'getCompoundingTokenPrice');
@@ -2421,7 +2383,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_11, token, _b, custodies_12, custody, _c, _d, market, whitelistMeta, depositCustodyConfig, rewardCustody, transaction, setCULimitIx, backUpOracleInstruction, result, index, res;
+                var custodies, custodyMetas, marketMetas, _a, custodies_11, token, _b, custodies_12, custody, _c, _d, market, whitelistMeta, depositCustodyConfig, rewardCustody, transaction, setCULimitIx, addressLookupTables, backUpOracleInstruction, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
@@ -2484,14 +2446,17 @@ var PerpetualsClient = (function () {
                             transaction = _f.sent();
                             setCULimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 450000 });
                             transaction.instructions.unshift(setCULimitIx);
-                            if (!enableBackupOracle) return [3, 3];
-                            return [4, (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true)];
+                            return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
                         case 2:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            if (!enableBackupOracle) return [3, 4];
+                            return [4, (0, backupOracle_1.createBackupOracleInstruction)(POOL_CONFIG.poolAddress.toBase58(), true)];
+                        case 3:
                             backUpOracleInstruction = _f.sent();
                             (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
-                            _f.label = 3;
-                        case 3: return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
-                        case 4:
+                            _f.label = 4;
+                        case 4: return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
+                        case 5:
                             result = _f.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getAddCompoundingLiquidityAmountAndFee'; });
                             res = this.viewHelper.decodeLogs(result, index, 'getAddCompoundingLiquidityAmountAndFee');
@@ -2509,7 +2474,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_13, token, _b, custodies_14, custody, _c, _d, market, whitelistMeta, removeCustodyConfig, rewardCustody, transaction, setCULimitIx, backUpOracleInstruction, result, index, res;
+                var custodies, custodyMetas, marketMetas, _a, custodies_13, token, _b, custodies_14, custody, _c, _d, market, whitelistMeta, removeCustodyConfig, rewardCustody, transaction, setCULimitIx, backUpOracleInstruction, addressLookupTables, result, index, res;
                 var _e;
                 if (userPublicKey === void 0) { userPublicKey = undefined; }
                 if (enableBackupOracle === void 0) { enableBackupOracle = false; }
@@ -2578,8 +2543,11 @@ var PerpetualsClient = (function () {
                             backUpOracleInstruction = _f.sent();
                             (_e = transaction.instructions).unshift.apply(_e, backUpOracleInstruction);
                             _f.label = 3;
-                        case 3: return [4, this.viewHelper.simulateTransaction(transaction, userPublicKey)];
+                        case 3: return [4, this.getOrLoadAddressLookupTable(POOL_CONFIG)];
                         case 4:
+                            addressLookupTables = (_f.sent()).addressLookupTables;
+                            return [4, this.viewHelper.simulateTransaction(transaction, addressLookupTables, userPublicKey)];
+                        case 5:
                             result = _f.sent();
                             index = perpetuals_1.IDL.instructions.findIndex(function (f) { return f.name === 'getRemoveCompoundingLiquidityAmountAndFee'; });
                             if (result.value.err) {
@@ -7631,44 +7599,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.setPositionPenalty = function (positionPubkey, oraclePenalty, oracleAuthority) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, setPositionPenaltyIx, err_52;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        instructions = [];
-                        additionalSigners = [];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4, this.program.methods
-                                .setPositionPenalty({
-                                oraclePenalty: oraclePenalty,
-                            })
-                                .accounts({
-                                authority: oracleAuthority,
-                                position: positionPubkey,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.program.programId,
-                            })
-                                .instruction()];
-                    case 2:
-                        setPositionPenaltyIx = _a.sent();
-                        instructions.push(setPositionPenaltyIx);
-                        return [3, 4];
-                    case 3:
-                        err_52 = _a.sent();
-                        console.log("perpClient setPositionPenalty error:: ", err_52);
-                        throw err_52;
-                    case 4: return [2, {
-                            instructions: __spreadArray([], instructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
-            });
-        }); };
         this.renameFlp = function (flag, lpTokenName, lpTokenSymbol, lpTokenUri, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_53;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_52;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7706,8 +7638,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_53 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_53);
+                        err_52 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_52);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -7717,7 +7649,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initStake = function (stakingFeeShareBps, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_54;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, stakedLpTokenAccount, rewardCustodyConfig, initStakeInstruction, err_53;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7755,9 +7687,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initStakeInstruction);
                         return [3, 4];
                     case 3:
-                        err_54 = _a.sent();
-                        console.log("perpClient InitStaking error:: ", err_54);
-                        throw err_54;
+                        err_53 = _a.sent();
+                        console.log("perpClient InitStaking error:: ", err_53);
+                        throw err_53;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7766,7 +7698,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initCompounding = function (feeShareBps, metadataTitle, metadataSymbol, metadataUri, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_55;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyConfig, compoundingTokenMint, compoundingVault, metadataAccount, initCompoundingInstruction, err_54;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7810,9 +7742,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initCompoundingInstruction);
                         return [3, 4];
                     case 3:
-                        err_55 = _a.sent();
-                        console.log("perpClient initCompounding error:: ", err_55);
-                        throw err_55;
+                        err_54 = _a.sent();
+                        console.log("perpClient initCompounding error:: ", err_54);
+                        throw err_54;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7821,7 +7753,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initTokenVault = function (token_permissions, tokens_to_distribute, withdrawTimeLimit, withdrawInstantFee, stakeLevel, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_56;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenMint, fundingTokenAccount, initTokenVaultInstruction, err_55;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7862,9 +7794,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initTokenVaultInstruction);
                         return [3, 4];
                     case 3:
-                        err_56 = _a.sent();
-                        console.log("perpClient InitTokenVaultInstruction error:: ", err_56);
-                        throw err_56;
+                        err_55 = _a.sent();
+                        console.log("perpClient InitTokenVaultInstruction error:: ", err_55);
+                        throw err_55;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7873,7 +7805,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenVaultConfig = function (token_permissions, withdrawTimeLimit, withdrawInstantFee, stakeLevel, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_57;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setTokenVaultConfigInstruction, err_56;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7904,9 +7836,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenVaultConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_57 = _a.sent();
-                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_57);
-                        throw err_57;
+                        err_56 = _a.sent();
+                        console.log("perpClient setTokenVaultConfigInstruction error:: ", err_56);
+                        throw err_56;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7915,7 +7847,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawInstantFee = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_58;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawInstantFeeInstruction, err_57;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7954,9 +7886,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawInstantFeeInstruction);
                         return [3, 6];
                     case 5:
-                        err_58 = _a.sent();
-                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_58);
-                        throw err_58;
+                        err_57 = _a.sent();
+                        console.log("perpClient withdrawInstantFeeInstruction error:: ", err_57);
+                        throw err_57;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -7965,7 +7897,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.withdrawUnclaimedTokens = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawUnclaimedTokensInstruction, err_59;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, receivingTokenAccount, withdrawUnclaimedTokensInstruction, err_58;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8004,9 +7936,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawUnclaimedTokensInstruction);
                         return [3, 6];
                     case 5:
-                        err_59 = _a.sent();
-                        console.log("perpClient withdrawUnclaimedTokensInstruction error:: ", err_59);
-                        throw err_59;
+                        err_58 = _a.sent();
+                        console.log("perpClient withdrawUnclaimedTokensInstruction error:: ", err_58);
+                        throw err_58;
                     case 6: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8015,7 +7947,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRevenueTokenAccount = function (feeShareBps, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_60;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, initRevenueTokenAccountInstruction, err_59;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8052,9 +7984,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRevenueTokenAccountInstruction);
                         return [3, 4];
                     case 3:
-                        err_60 = _a.sent();
-                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_60);
-                        throw err_60;
+                        err_59 = _a.sent();
+                        console.log("perpClient initRevenueTokenAccountInstruction error:: ", err_59);
+                        throw err_59;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8063,7 +7995,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRebateVault = function (allowRebatePayout, rebateSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateCustodyMint, initRebateVaultInstruction, err_61;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rebateCustodyMint, initRebateVaultInstruction, err_60;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8098,9 +8030,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRebateVaultInstruction);
                         return [3, 4];
                     case 3:
-                        err_61 = _a.sent();
-                        console.log("perpClient initRebateVaultInstruction error:: ", err_61);
-                        throw err_61;
+                        err_60 = _a.sent();
+                        console.log("perpClient initRebateVaultInstruction error:: ", err_60);
+                        throw err_60;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8109,7 +8041,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.distributeTokenReward = function (amount, epochCount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_62;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustodyMint, fundingTokenAccount, revenueFundingTokenAccount, distributeTokenRewardInstruction, err_61;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8148,9 +8080,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_62 = _a.sent();
-                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_62);
-                        throw err_62;
+                        err_61 = _a.sent();
+                        console.log("perpClient distributeTokenRewardInstruction error:: ", err_61);
+                        throw err_61;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8159,7 +8091,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenStakeLevel = function (owner, stakeLevel) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_63;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenStakeLevelInstruction, err_62;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8187,9 +8119,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenStakeLevelInstruction);
                         return [3, 4];
                     case 3:
-                        err_63 = _a.sent();
-                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_63);
-                        throw err_63;
+                        err_62 = _a.sent();
+                        console.log("perpClient setTokenStakeLevelInstruction error:: ", err_62);
+                        throw err_62;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8198,7 +8130,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setTokenReward = function (owner, amount, epochCount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_64;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, tokenStakeAccount, setTokenRewardInstruction, err_63;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8230,9 +8162,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setTokenRewardInstruction);
                         return [3, 4];
                     case 3:
-                        err_64 = _a.sent();
-                        console.log("perpClient setTokenRewardInstruction error:: ", err_64);
-                        throw err_64;
+                        err_63 = _a.sent();
+                        console.log("perpClient setTokenRewardInstruction error:: ", err_63);
+                        throw err_63;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8241,7 +8173,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.resizeInternalOracle = function (extOracle, tokenMint, intOracleAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, resizeInternalOracleInstruction, err_65;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, resizeInternalOracleInstruction, err_64;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8270,9 +8202,9 @@ var PerpetualsClient = (function () {
                         instructions.push(resizeInternalOracleInstruction);
                         return [3, 4];
                     case 3:
-                        err_65 = _a.sent();
-                        console.log("perpClient resizeInternalOracleInstruction error:: ", err_65);
-                        throw err_65;
+                        err_64 = _a.sent();
+                        console.log("perpClient resizeInternalOracleInstruction error:: ", err_64);
+                        throw err_64;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8281,7 +8213,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.createWhitelist = function (isSwapFeeExempt, isDepositFeeExempt, isWithdrawalFeeExempt, poolAddress, owner) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, whitelist, createWhitelistInstruction, err_66;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, whitelist, createWhitelistInstruction, err_65;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8314,9 +8246,9 @@ var PerpetualsClient = (function () {
                         instructions.push(createWhitelistInstruction);
                         return [3, 4];
                     case 3:
-                        err_66 = _a.sent();
-                        console.log("perpClient createWhitelistInstruction error:: ", err_66);
-                        throw err_66;
+                        err_65 = _a.sent();
+                        console.log("perpClient createWhitelistInstruction error:: ", err_65);
+                        throw err_65;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -8325,7 +8257,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setWhitelistConfig = function (isSwapFeeExempt, isDepositFeeExempt, isWithdrawalFeeExempt, poolAddress, owner) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, whitelist, setWhitelistConfigInstruction, err_67;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, whitelist, setWhitelistConfigInstruction, err_66;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -8358,9 +8290,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setWhitelistConfigInstruction);
                         return [3, 4];
                     case 3:
-                        err_67 = _a.sent();
-                        console.log("perpClient setWhitelistConfigInstruction error:: ", err_67);
-                        throw err_67;
+                        err_66 = _a.sent();
+                        console.log("perpClient setWhitelistConfigInstruction error:: ", err_66);
+                        throw err_66;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners