flash-sdk 2.16.3 → 2.17.1

package/dist/PerpetualsClient.js

@@ -4981,7 +4981,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 payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, forceClosePosition, closeWsolATAIns, err_24;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, forceClosePosition, closeWsolATAIns, err_24;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -4995,78 +4995,632 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 7, , 8]);
-                            if (!(collateralSymbol == 'SOL')) return [3, 2];
+                            _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
+                                    .forceClosePosition({
+                                    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:
+                            forceClosePosition = _b.sent();
+                            instructions.push(forceClosePosition);
+                            if (collateralSymbol == 'WSOL' && closeUsersWSOLATA) {
+                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, positionAccount.owner, positionAccount.owner);
+                                postInstructions.push(closeWsolATAIns);
+                            }
+                            return [3, 7];
+                        case 6:
+                            err_24 = _b.sent();
+                            console.log("perpClient forceClosePosition error:: ", err_24);
+                            throw err_24;
+                        case 7: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
+        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) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            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;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            reserveCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey); });
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, publicKey)];
+                        case 1:
+                            userReserveTokenAccount = _c.sent();
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            _c.label = 2;
+                        case 2:
+                            _c.trys.push([2, 10, , 11]);
+                            if (!(reserveSymbol == 'SOL')) return [3, 5];
+                            console.log("reserveSymbol === SOL", reserveSymbol);
+                            wrappedSolAccount = new web3_js_1.Keypair();
+                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
+                        case 3:
+                            accCreationLamports = (_c.sent());
+                            console.log("accCreationLamports:", accCreationLamports);
+                            lamports = reserveAmount.add(new anchor_1.BN(accCreationLamports));
+                            _a = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getBalance(publicKey)];
+                        case 4:
+                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
+                            if (unWrappedSolBalance.lt(lamports)) {
+                                throw "Insufficient SOL Funds";
+                            }
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: wrappedSolAccount.publicKey,
+                                    lamports: lamports.toNumber(),
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)(wrappedSolAccount.publicKey, spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)(wrappedSolAccount.publicKey, publicKey, publicKey),
+                            ];
+                            additionalSigners.push(wrappedSolAccount);
+                            return [3, 8];
+                        case 5: return [4, (0, utils_1.checkIfAccountExists)(userReserveTokenAccount, this.provider.connection)];
+                        case 6:
+                            if (!(_c.sent())) {
+                                throw "Insufficient Funds , token Account doesn't exist";
+                            }
+                            if (!!skipBalanceChecks) return [3, 8];
+                            _b = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getTokenAccountBalance(userReserveTokenAccount)];
+                        case 7:
+                            tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_c.sent()).value.amount]))();
+                            if (tokenAccountBalance.lt(reserveAmount)) {
+                                throw "Insufficient Funds need more ".concat(reserveAmount.sub(tokenAccountBalance), " tokens");
+                            }
+                            _c.label = 8;
+                        case 8:
+                            positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
+                            orderAccount = poolConfig.getOrderFromMarketPk(publicKey, marketAccount);
+                            return [4, this.program.methods
+                                    .placeLimitOrder({
+                                    limitPrice: limitPrice,
+                                    reserveAmount: reserveAmount,
+                                    sizeAmount: sizeAmount,
+                                    stopLossPrice: stopLossPrice,
+                                    takeProfitPrice: takeProfitPrice,
+                                    receiveCustodyId: receiveCustodyId
+                                })
+                                    .accounts({
+                                    owner: publicKey,
+                                    feePayer: publicKey,
+                                    fundingAccount: reserveSymbol == 'SOL' ? wrappedSolAccount.publicKey : userReserveTokenAccount,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionAccount,
+                                    order: orderAccount,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                    reserveCustody: reserveCustodyConfig.custodyAccount,
+                                    reserveOracleAccount: this.useExtOracleAccount ? reserveCustodyConfig.extOracleAccount : reserveCustodyConfig.intOracleAccount,
+                                    reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
+                                    systemProgram: web3_js_1.SystemProgram.programId,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .instruction()];
+                        case 9:
+                            placeLimitOrder = _c.sent();
+                            instructions.push(placeLimitOrder);
+                            return [3, 11];
+                        case 10:
+                            err_26 = _c.sent();
+                            console.log("perpClient placeLimitOrder error:: ", err_26);
+                            throw err_26;
+                        case 11: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
+        this.editLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey) {
+            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;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            reserveCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(reserveSymbol).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, 8, , 9]);
+                            if (!(collateralSymbol == 'SOL')) return [3, 3];
                             console.log("collateralSymbol === SOL", collateralSymbol);
-                            lamports = this.minimumBalanceForRentExemptAccountLamports;
+                            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: payerPubkey,
+                                    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, positionAccount.owner),
+                                (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), positionAccount.owner, positionAccount.owner),
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
                             ];
-                            return [3, 5];
-                        case 2:
-                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, positionAccount.owner, true);
+                            additionalSigners.push(wrappedSolAccount);
+                            return [3, 6];
+                        case 3:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
                             _a = createUserATA;
-                            if (!_a) return [3, 4];
+                            if (!_a) return [3, 5];
                             return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 3:
-                            _a = !(_b.sent());
-                            _b.label = 4;
                         case 4:
+                            _a = !(_b.sent());
+                            _b.label = 5;
+                        case 5:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, positionAccount.owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
-                            _b.label = 5;
-                        case 5: return [4, this.program.methods
-                                .forceClosePosition({
-                                privilege: types_1.Privilege.None,
+                            _b.label = 6;
+                        case 6:
+                            positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
+                            orderAccount = poolConfig.getOrderFromMarketPk(publicKey, marketAccount);
+                            return [4, this.program.methods
+                                    .editLimitOrder({
+                                    orderId: orderId,
+                                    limitPrice: limitPrice,
+                                    sizeAmount: sizeAmount,
+                                    stopLossPrice: stopLossPrice,
+                                    takeProfitPrice: takeProfitPrice
+                                })
+                                    .accounts({
+                                    owner: publicKey,
+                                    feePayer: publicKey,
+                                    receivingAccount: reserveSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionAccount,
+                                    order: orderAccount,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                    reserveCustody: reserveCustodyConfig.custodyAccount,
+                                    reserveOracleAccount: this.useExtOracleAccount ? reserveCustodyConfig.extOracleAccount : reserveCustodyConfig.intOracleAccount,
+                                    reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .instruction()];
+                        case 7:
+                            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, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
+        this.executeLimitOrder = function (targetSymbol, collateralSymbol, side, orderId, privilege, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, poolConfig) {
+            if (nftTradingAccount === void 0) { nftTradingAccount = web3_js_1.PublicKey.default; }
+            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;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            publicKey = 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 = [];
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 3, , 4]);
+                            positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
+                            orderAccount = poolConfig.getOrderFromMarketPk(publicKey, marketAccount);
+                            return [4, this.program.methods
+                                    .executeLimitOrder({
+                                    orderId: orderId,
+                                    privilege: privilege
+                                })
+                                    .accounts({
+                                    feePayer: publicKey,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionAccount,
+                                    order: orderAccount,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                    systemProgram: web3_js_1.SystemProgram.programId,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
+                                    .instruction()];
+                        case 2:
+                            executeLimitOrder = _a.sent();
+                            instructions.push(executeLimitOrder);
+                            return [3, 4];
+                        case 3:
+                            err_28 = _a.sent();
+                            console.log("perpClient executeLimitOrder error:: ", err_28);
+                            throw err_28;
+                        case 4: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
+        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;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = 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 = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
+                        orderAccount = poolConfig.getOrderFromMarketPk(publicKey, marketAccount);
+                        return [4, this.program.methods
+                                .placeTriggerOrder({
+                                triggerPrice: triggerPrice,
+                                deltaSizeAmount: deltaSizeAmount,
+                                isStopLoss: isStopLoss,
+                                receiveCustodyId: receiveCustodyId
+                            })
+                                .accounts({
+                                owner: publicKey,
+                                feePayer: publicKey,
+                                perpetuals: poolConfig.perpetuals,
+                                pool: poolConfig.poolAddress,
+                                position: positionAccount,
+                                order: orderAccount,
+                                market: marketAccount,
+                                targetCustody: targetCustodyConfig.custodyAccount,
+                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                collateralCustody: collateralCustodyConfig.custodyAccount,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        placeTriggerOrder = _a.sent();
+                        instructions.push(placeTriggerOrder);
+                        return [3, 4];
+                    case 3:
+                        err_29 = _a.sent();
+                        console.log("perpClient placeTriggerOrder error:: ", err_29);
+                        throw err_29;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        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;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = 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 = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
+                        orderAccount = poolConfig.getOrderFromMarketPk(publicKey, marketAccount);
+                        return [4, this.program.methods
+                                .editTriggerOrder({
+                                orderId: orderId,
+                                triggerPrice: triggerPrice,
+                                deltaSizeAmount: deltaSizeAmount,
                                 isStopLoss: isStopLoss
                             })
                                 .accounts({
-                                owner: positionAccount.owner,
-                                receivingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                perpetuals: this.perpetuals.publicKey,
+                                owner: publicKey,
+                                perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
-                                position: positionAccount.publicKey,
+                                position: positionAccount,
+                                order: orderAccount,
                                 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 6:
-                            forceClosePosition = _b.sent();
-                            instructions.push(forceClosePosition);
-                            if (collateralSymbol == 'WSOL' && closeUsersWSOLATA) {
-                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, positionAccount.owner, positionAccount.owner);
-                                postInstructions.push(closeWsolATAIns);
+                    case 2:
+                        editTriggerOrder = _a.sent();
+                        instructions.push(editTriggerOrder);
+                        return [3, 4];
+                    case 3:
+                        err_30 = _a.sent();
+                        console.log("perpClient editTriggerOrder error:: ", err_30);
+                        throw err_30;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.executeTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, isStopLoss, poolConfig, createUserATA, ephemeralSignerPubkey) {
+            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;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            publicKey = 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, 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);
                             }
-                            return [3, 8];
+                            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:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
+                            _a = createUserATA;
+                            if (!_a) return [3, 5];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 4:
+                            _a = !(_b.sent());
+                            _b.label = 5;
+                        case 5:
+                            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
+                                    .executeTriggerOrder({
+                                    isStopLoss: isStopLoss,
+                                    orderId: orderId
+                                })
+                                    .accounts({
+                                    feePayer: publicKey,
+                                    receivingAccount: collateralSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionAccount,
+                                    order: orderAccount,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .instruction()];
                         case 7:
-                            err_24 = _b.sent();
-                            console.log("perpClient forceClosePosition error:: ", err_24);
-                            throw err_24;
-                        case 8: return [2, {
+                            executeTriggerOrder = _b.sent();
+                            instructions.push(executeTriggerOrder);
+                            return [3, 9];
+                        case 8:
+                            err_31 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_31);
+                            throw err_31;
+                        case 9: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -5075,7 +5629,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.getPositionData = function (position, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_25;
+            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_32;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5104,15 +5658,15 @@ var PerpetualsClient = (function () {
                         console.log(getPositionData);
                         return [2, getPositionData];
                     case 3:
-                        err_25 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_25);
-                        throw err_25;
+                        err_32 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_32);
+                        throw err_32;
                     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_26;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_33;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5145,9 +5699,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_26 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_26);
-                        throw err_26;
+                        err_33 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_33);
+                        throw err_33;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5156,7 +5710,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_27;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_34;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5183,9 +5737,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_27 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_27);
-                        throw err_27;
+                        err_34 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_34);
+                        throw err_34;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5194,7 +5748,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_28;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_35;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -5254,9 +5808,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_28 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_28);
-                        throw err_28;
+                        err_35 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_35);
+                        throw err_35;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5265,7 +5819,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_29;
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_36;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5298,9 +5852,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_29 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_29);
-                        throw err_29;
+                        err_36 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_36);
+                        throw err_36;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5312,7 +5866,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_30;
+                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;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -5435,8 +5989,8 @@ var PerpetualsClient = (function () {
                             instructions.push(addCompoundingLiquidity);
                             return [3, 10];
                         case 9:
-                            err_30 = _e.sent();
-                            console.log("perpClient addCompoundingLiquidity error:: ", err_30);
+                            err_37 = _e.sent();
+                            console.log("perpClient addCompoundingLiquidity error:: ", err_37);
                             return [3, 10];
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5450,7 +6004,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_31;
+                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;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -5557,8 +6111,8 @@ var PerpetualsClient = (function () {
                             instructions.push(removeCompoundingLiquidity);
                             return [3, 8];
                         case 7:
-                            err_31 = _e.sent();
-                            console.log("perpClient removeCompoundingLiquidity error:: ", err_31);
+                            err_38 = _e.sent();
+                            console.log("perpClient removeCompoundingLiquidity error:: ", err_38);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5571,7 +6125,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_32;
+                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;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -5652,8 +6206,8 @@ var PerpetualsClient = (function () {
                             instructions.push(migrateStake);
                             return [3, 6];
                         case 5:
-                            err_32 = _e.sent();
-                            console.log("perpClient migrateStake error:: ", err_32);
+                            err_39 = _e.sent();
+                            console.log("perpClient migrateStake error:: ", err_39);
                             return [3, 6];
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5664,7 +6218,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_33;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_40;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -5736,8 +6290,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_33 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_33);
+                        err_40 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_40);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -5749,7 +6303,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_34;
+                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, compoundingFee, err_41;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -5806,8 +6360,8 @@ var PerpetualsClient = (function () {
                             instructions.push(compoundingFee);
                             return [3, 4];
                         case 3:
-                            err_34 = _d.sent();
-                            console.log("perpClient compoundingFee error:: ", err_34);
+                            err_41 = _d.sent();
+                            console.log("perpClient compoundingFee error:: ", err_41);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -5818,7 +6372,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_35;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_42;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5856,8 +6410,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_35 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_35);
+                        err_42 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_42);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -5867,7 +6421,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_36;
+            var publicKey, rewardMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, transferAuthority, initRewardVault, err_43;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5901,9 +6455,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_36 = _a.sent();
-                        console.log("rewardDistribution InitRewardVault error:: ", err_36);
-                        throw err_36;
+                        err_43 = _a.sent();
+                        console.log("rewardDistribution InitRewardVault error:: ", err_43);
+                        throw err_43;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5912,7 +6466,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.updateCounterReward = function () { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_37;
+            var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_44;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5935,9 +6489,9 @@ var PerpetualsClient = (function () {
                         instructions.push(updateCounter);
                         return [3, 4];
                     case 3:
-                        err_37 = _a.sent();
-                        console.log("rewardDistribution updateCounter error:: ", err_37);
-                        throw err_37;
+                        err_44 = _a.sent();
+                        console.log("rewardDistribution updateCounter error:: ", err_44);
+                        throw err_44;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5946,7 +6500,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_38;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, rewardRecord, distributeReward, err_45;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5985,9 +6539,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 4];
                     case 3:
-                        err_38 = _a.sent();
-                        console.log("rewardDistribution distributeReward error:: ", err_38);
-                        throw err_38;
+                        err_45 = _a.sent();
+                        console.log("rewardDistribution distributeReward error:: ", err_45);
+                        throw err_45;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5998,7 +6552,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_39;
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, receivingTokenAccount, _a, rewardVault, rewardTokenAccount, rewardRecord, transferAuthority, collectNftReward, err_46;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6044,8 +6598,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectNftReward);
                             return [3, 6];
                         case 5:
-                            err_39 = _b.sent();
-                            throw err_39;
+                            err_46 = _b.sent();
+                            throw err_46;
                         case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners