flash-sdk 2.17.5 → 2.17.7

package/dist/PerpetualsClient.js

@@ -567,7 +567,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.liquidate = function (positionAccount, poolConfig, tokenMint, collateralMint, marketPk) { return __awaiter(_this, void 0, void 0, function () {
+        this.liquidate = function (positionAccount, orderAccount, poolConfig, tokenMint, collateralMint, marketPk) { return __awaiter(_this, void 0, void 0, function () {
             var targetCustodyConfig, collateralCustodyConfig;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -581,6 +581,7 @@ var PerpetualsClient = (function () {
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
                                 position: positionAccount,
+                                order: orderAccount,
                                 market: marketPk,
                                 targetCustody: targetCustodyConfig.custodyAccount,
                                 targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
@@ -2505,7 +2506,7 @@ var PerpetualsClient = (function () {
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, instruction, closeWsolATAIns, error_2;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, collateralCustodyConfig, targetCustodyConfig, marketAccount, positionAccount, orderAccount, instruction, closeWsolATAIns, error_2;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -2556,6 +2557,7 @@ var PerpetualsClient = (function () {
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
+                            orderAccount = poolConfig.getOrderFromMarketPk(publicKey, marketAccount);
                             return [4, this.program.methods
                                     .closePosition({
                                     priceWithSlippage: priceWithSlippage,
@@ -2569,6 +2571,7 @@ var PerpetualsClient = (function () {
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
                                     position: positionAccount,
+                                    order: orderAccount,
                                     market: marketAccount,
                                     targetCustody: targetCustodyConfig.custodyAccount,
                                     targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
@@ -2608,7 +2611,7 @@ var PerpetualsClient = (function () {
             if (nftRebateTokenAccount === void 0) { nftRebateTokenAccount = web3_js_1.PublicKey.default; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, swapInCustodyConfig, swapOutCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, marketAccount, positionAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody, instruction;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, swapInCustodyConfig, swapOutCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, marketAccount, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody, instruction;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -2664,6 +2667,7 @@ var PerpetualsClient = (function () {
                             }
                             marketAccount = positionPoolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             positionAccount = positionPoolConfig.getPositionFromMarketPk(publicKey, marketAccount);
+                            orderAccount = positionPoolConfig.getOrderFromMarketPk(publicKey, marketAccount);
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             for (_i = 0, _a = swapPoolConfig.custodies; _i < _a.length; _i++) {
@@ -2701,6 +2705,7 @@ var PerpetualsClient = (function () {
                                     dispensingCustodyTokenAccount: swapOutCustodyConfig.tokenAccount,
                                     positionPool: positionPoolConfig.poolAddress,
                                     position: positionAccount,
+                                    order: orderAccount,
                                     market: marketAccount,
                                     targetCustody: targetCustodyConfig.custodyAccount,
                                     targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
@@ -5070,88 +5075,11 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.forceClosePartial = function (positionAccount, targetSymbol, collateralSymbol, side, priceWithSlippage, sizeDelta, isStopLoss, poolConfig, createUserATA, closeUsersWSOLATA) {
-            if (createUserATA === void 0) { createUserATA = true; }
-            if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
-            return __awaiter(_this, void 0, void 0, function () {
-                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, forceClosePartial, closeWsolATAIns, err_25;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            payerPubkey = this.provider.wallet.publicKey;
-                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
-                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
-                            preInstructions = [];
-                            instructions = [];
-                            postInstructions = [];
-                            additionalSigners = [];
-                            _b.label = 1;
-                        case 1:
-                            _b.trys.push([1, 6, , 7]);
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, positionAccount.owner)];
-                        case 2:
-                            userReceivingTokenAccount = _b.sent();
-                            _a = createUserATA;
-                            if (!_a) return [3, 4];
-                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 3:
-                            _a = !(_b.sent());
-                            _b.label = 4;
-                        case 4:
-                            if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, positionAccount.owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
-                            }
-                            return [4, this.program.methods
-                                    .forceClosePartial({
-                                    priceWithSlippage: priceWithSlippage,
-                                    sizeDelta: sizeDelta,
-                                    isStopLoss: isStopLoss
-                                })
-                                    .accounts({
-                                    owner: positionAccount.owner,
-                                    receivingAccount: userReceivingTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: this.perpetuals.publicKey,
-                                    pool: poolConfig.poolAddress,
-                                    position: positionAccount.publicKey,
-                                    market: marketAccount,
-                                    targetCustody: targetCustodyConfig.custodyAccount,
-                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
-                                    collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
-                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    program: this.programId,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                                })
-                                    .instruction()];
-                        case 5:
-                            forceClosePartial = _b.sent();
-                            instructions.push(forceClosePartial);
-                            if (collateralSymbol == 'WSOL' && closeUsersWSOLATA) {
-                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, positionAccount.owner, positionAccount.owner);
-                                postInstructions.push(closeWsolATAIns);
-                            }
-                            return [3, 7];
-                        case 6:
-                            err_25 = _b.sent();
-                            console.log("perpClient forceClosePartial error:: ", err_25);
-                            throw err_25;
-                        case 7: return [2, {
-                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                                additionalSigners: additionalSigners
-                            }];
-                    }
-                });
-            });
-        };
         this.placeLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, side, limitPrice, reserveAmount, sizeAmount, stopLossPrice, takeProfitPrice, receiveCustodyId, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_26;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_25;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -5255,9 +5183,9 @@ var PerpetualsClient = (function () {
                             instructions.push(placeLimitOrder);
                             return [3, 11];
                         case 10:
-                            err_26 = _c.sent();
-                            console.log("perpClient placeLimitOrder error:: ", err_26);
-                            throw err_26;
+                            err_25 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_25);
+                            throw err_25;
                         case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5266,11 +5194,10 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.editLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey) {
+        this.editLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
-            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_27;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, _a, positionAccount, orderAccount, editLimitOrder, err_26;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5285,48 +5212,18 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 8, , 9]);
-                            if (!(collateralSymbol == 'SOL')) return [3, 3];
-                            console.log("collateralSymbol === SOL", collateralSymbol);
-                            wrappedSolAccount = new web3_js_1.Keypair();
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 2:
-                            accCreationLamports = (_b.sent());
-                            console.log("accCreationLamports:", accCreationLamports);
-                            lamports = accCreationLamports;
-                            if (!ephemeralSignerPubkey) {
-                                wrappedSolAccount = new web3_js_1.Keypair();
-                                additionalSigners.push(wrappedSolAccount);
-                            }
-                            preInstructions = [
-                                web3_js_1.SystemProgram.createAccount({
-                                    fromPubkey: publicKey,
-                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
-                                    lamports: lamports,
-                                    space: 165,
-                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
-                                }),
-                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
-                            ];
-                            postInstructions = [
-                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
-                            ];
-                            additionalSigners.push(wrappedSolAccount);
-                            return [3, 6];
-                        case 3:
+                            _b.trys.push([1, 5, , 6]);
                             userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
                             _a = createUserATA;
-                            if (!_a) return [3, 5];
+                            if (!_a) return [3, 3];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 4:
+                        case 2:
                             _a = !(_b.sent());
-                            _b.label = 5;
-                        case 5:
+                            _b.label = 3;
+                        case 3:
                             if (_a) {
                                 preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
-                            _b.label = 6;
-                        case 6:
                             positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
                             orderAccount = poolConfig.getOrderFromMarketPk(publicKey, marketAccount);
                             return [4, this.program.methods
@@ -5340,7 +5237,6 @@ var PerpetualsClient = (function () {
                                     .accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
-                                    receivingAccount: reserveSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
@@ -5354,18 +5250,18 @@ var PerpetualsClient = (function () {
                                     reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
                                 })
                                     .instruction()];
-                        case 7:
+                        case 4:
                             editLimitOrder = _b.sent();
                             instructions.push(editLimitOrder);
-                            return [3, 9];
-                        case 8:
-                            err_27 = _b.sent();
-                            console.log("perpClient editLimitOrder error:: ", err_27);
-                            throw err_27;
-                        case 9: return [2, {
+                            return [3, 6];
+                        case 5:
+                            err_26 = _b.sent();
+                            console.log("perpClient editLimitOrder error:: ", err_26);
+                            throw err_26;
+                        case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5378,7 +5274,7 @@ var PerpetualsClient = (function () {
             if (nftReferralAccount === void 0) { nftReferralAccount = web3_js_1.PublicKey.default; }
             if (nftRebateTokenAccount === void 0) { nftRebateTokenAccount = web3_js_1.PublicKey.default; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_28;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitOrder, err_27;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -5424,9 +5320,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeLimitOrder);
                             return [3, 4];
                         case 3:
-                            err_28 = _a.sent();
-                            console.log("perpClient executeLimitOrder error:: ", err_28);
-                            throw err_28;
+                            err_27 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_27);
+                            throw err_27;
                         case 4: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5436,7 +5332,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.placeTriggerOrder = function (targetSymbol, collateralSymbol, side, triggerPrice, deltaSizeAmount, isStopLoss, receiveCustodyId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_29;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_28;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5483,9 +5379,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_29 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_29);
-                        throw err_29;
+                        err_28 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_28);
+                        throw err_28;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5494,7 +5390,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.editTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_30;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_29;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5539,9 +5435,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_30 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_30);
-                        throw err_30;
+                        err_29 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_29);
+                        throw err_29;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5553,7 +5449,7 @@ var PerpetualsClient = (function () {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, _a, positionAccount, orderAccount, executeTriggerOrder, err_31;
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, _a, positionAccount, orderAccount, executeTriggerOrder, err_30;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5639,9 +5535,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerOrder);
                             return [3, 9];
                         case 8:
-                            err_31 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_31);
-                            throw err_31;
+                            err_30 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_30);
+                            throw err_30;
                         case 9: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5651,7 +5547,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.getPositionData = function (position, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_32;
+            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_31;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5680,15 +5576,15 @@ var PerpetualsClient = (function () {
                         console.log(getPositionData);
                         return [2, getPositionData];
                     case 3:
-                        err_32 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_32);
-                        throw err_32;
+                        err_31 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_31);
+                        throw err_31;
                     case 4: return [2];
                 }
             });
         }); };
         this.protocolWithdrawFees = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_33;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_32;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5721,9 +5617,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_33 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_33);
-                        throw err_33;
+                        err_32 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_32);
+                        throw err_32;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5732,7 +5628,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_34;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_33;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5759,9 +5655,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_34 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_34);
-                        throw err_34;
+                        err_33 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_33);
+                        throw err_33;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5770,7 +5666,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.reimburse = function (tokenMint, amountIn, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_35;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_34;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -5830,9 +5726,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_35 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_35);
-                        throw err_35;
+                        err_34 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_34);
+                        throw err_34;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5841,7 +5737,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setInternalOraclePrice = function (tokenMint, price, expo, conf, ema, publishTime, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_36;
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_35;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5874,9 +5770,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_36 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_36);
-                        throw err_36;
+                        err_35 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_35);
+                        throw err_35;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5888,7 +5784,7 @@ var PerpetualsClient = (function () {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, addCompoundingLiquidity, err_37;
+                var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, lamports, unWrappedSolBalance, _d, addCompoundingLiquidity, err_36;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6011,8 +5907,8 @@ var PerpetualsClient = (function () {
                             instructions.push(addCompoundingLiquidity);
                             return [3, 10];
                         case 9:
-                            err_37 = _e.sent();
-                            console.log("perpClient addCompoundingLiquidity error:: ", err_37);
+                            err_36 = _e.sent();
+                            console.log("perpClient addCompoundingLiquidity error:: ", err_36);
                             return [3, 10];
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6026,7 +5922,7 @@ var PerpetualsClient = (function () {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, compoundingTokenAccount, removeCompoundingLiquidity, err_38;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, compoundingTokenAccount, removeCompoundingLiquidity, err_37;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6133,8 +6029,8 @@ var PerpetualsClient = (function () {
                             instructions.push(removeCompoundingLiquidity);
                             return [3, 8];
                         case 7:
-                            err_38 = _e.sent();
-                            console.log("perpClient removeCompoundingLiquidity error:: ", err_38);
+                            err_37 = _e.sent();
+                            console.log("perpClient removeCompoundingLiquidity error:: ", err_37);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6147,7 +6043,7 @@ var PerpetualsClient = (function () {
         this.migrateStake = function (amount, rewardTokenMint, poolConfig, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, migrateStake, err_39;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, migrateStake, err_38;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6228,8 +6124,8 @@ var PerpetualsClient = (function () {
                             instructions.push(migrateStake);
                             return [3, 6];
                         case 5:
-                            err_39 = _e.sent();
-                            console.log("perpClient migrateStake error:: ", err_39);
+                            err_38 = _e.sent();
+                            console.log("perpClient migrateStake error:: ", err_38);
                             return [3, 6];
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6240,7 +6136,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.migrateFlp = function (amount, rewardTokenMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_40;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_39;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -6312,8 +6208,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_40 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_40);
+                        err_39 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_39);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6325,7 +6221,7 @@ var PerpetualsClient = (function () {
         this.compoundingFee = function (poolConfig, rewardTokenSymbol) {
             if (rewardTokenSymbol === void 0) { rewardTokenSymbol = 'USDC'; }
             return __awaiter(_this, void 0, void 0, function () {
-                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, compoundingFee, err_41;
+                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, compoundingFee, err_40;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -6382,8 +6278,8 @@ var PerpetualsClient = (function () {
                             instructions.push(compoundingFee);
                             return [3, 4];
                         case 3:
-                            err_41 = _d.sent();
-                            console.log("perpClient compoundingFee error:: ", err_41);
+                            err_40 = _d.sent();
+                            console.log("perpClient compoundingFee error:: ", err_40);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -6394,7 +6290,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.renameFlp = function (flag, lpTokenName, lpTokenSymbol, lpTokenUri, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_42;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_41;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6432,8 +6328,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_42 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_42);
+                        err_41 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_41);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -6443,7 +6339,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.initRewardDistribution = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, transferAuthority, initRewardVault, err_43;
+            var publicKey, rewardMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, transferAuthority, initRewardVault, err_42;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6477,9 +6373,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_43 = _a.sent();
-                        console.log("rewardDistribution InitRewardVault error:: ", err_43);
-                        throw err_43;
+                        err_42 = _a.sent();
+                        console.log("rewardDistribution InitRewardVault error:: ", err_42);
+                        throw err_42;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6488,7 +6384,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.updateCounterReward = function () { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_44;
+            var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_43;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6511,9 +6407,9 @@ var PerpetualsClient = (function () {
                         instructions.push(updateCounter);
                         return [3, 4];
                     case 3:
-                        err_44 = _a.sent();
-                        console.log("rewardDistribution updateCounter error:: ", err_44);
-                        throw err_44;
+                        err_43 = _a.sent();
+                        console.log("rewardDistribution updateCounter error:: ", err_43);
+                        throw err_43;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6522,7 +6418,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.rewardDistribution = function (counter, owner, rewardAmount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, rewardRecord, distributeReward, err_45;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, rewardRecord, distributeReward, err_44;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6561,9 +6457,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 4];
                     case 3:
-                        err_45 = _a.sent();
-                        console.log("rewardDistribution distributeReward error:: ", err_45);
-                        throw err_45;
+                        err_44 = _a.sent();
+                        console.log("rewardDistribution distributeReward error:: ", err_44);
+                        throw err_44;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6574,7 +6470,7 @@ var PerpetualsClient = (function () {
         this.collectReward = function (counter, owner, rewardSymbol, poolConfig, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, rewardCustodyMint, instructions, additionalSigners, receivingTokenAccount, _a, rewardVault, rewardTokenAccount, rewardRecord, transferAuthority, collectNftReward, err_46;
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, receivingTokenAccount, _a, rewardVault, rewardTokenAccount, rewardRecord, transferAuthority, collectNftReward, err_45;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6620,8 +6516,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectNftReward);
                             return [3, 6];
                         case 5:
-                            err_46 = _b.sent();
-                            throw err_46;
+                            err_45 = _b.sent();
+                            throw err_45;
                         case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners