flash-sdk 2.18.2 → 2.19.1

package/dist/PerpetualsClient.d.ts

@@ -4106,6 +4106,10 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    executeLimitWithSwap: (userPubkey: PublicKey, targetSymbol: string, collateralSymbol: string, reserveSymbol: string, side: Side, orderId: number, poolConfig: PoolConfig, privilege: Privilege, nftTradingAccount?: PublicKey, nftReferralAccount?: PublicKey, nftRebateTokenAccount?: PublicKey) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
     placeTriggerOrder: (targetSymbol: string, collateralSymbol: string, side: Side, triggerPrice: ContractOraclePrice, deltaSizeAmount: BN, isStopLoss: boolean, receiveCustodyId: number, poolConfig: PoolConfig) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
@@ -4118,6 +4122,10 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    executeTriggerWithSwap: (owner: PublicKey, targetSymbol: string, collateralSymbol: string, receivingSymbol: string, side: Side, orderId: number, isStopLoss: boolean, poolConfig: PoolConfig, createUserATA?: boolean, ephemeralSignerPubkey?: any) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
     executeTriggerOrder: (owner: PublicKey, targetSymbol: string, collateralSymbol: string, side: Side, orderId: number, isStopLoss: boolean, poolConfig: PoolConfig, createUserATA?: boolean, ephemeralSignerPubkey?: any) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];

package/dist/PerpetualsClient.js

@@ -5583,8 +5583,72 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.executeLimitWithSwap = function (userPubkey, targetSymbol, collateralSymbol, reserveSymbol, side, orderId, poolConfig, privilege, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount) {
+            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, reserveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, executeLimitWithSwap, 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); });
+                            reserveCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(reserveSymbol).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(userPubkey, marketAccount);
+                            orderAccount = poolConfig.getOrderFromMarketPk(userPubkey, marketAccount);
+                            return [4, this.program.methods
+                                    .executeLimitWithSwap({
+                                    orderId: orderId,
+                                    privilege: privilege
+                                })
+                                    .accounts({
+                                    feePayer: publicKey,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    reserveCustody: reserveCustodyConfig.custodyAccount,
+                                    reserveCustodyOracleAccount: this.useExtOracleAccount ? reserveCustodyConfig.extOracleAccount : reserveCustodyConfig.intOracleAccount,
+                                    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,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(__spreadArray([], (0, getNftAccounts_1.getNftAccounts)(nftTradingAccount, nftReferralAccount, nftRebateTokenAccount, privilege), true))
+                                    .instruction()];
+                        case 2:
+                            executeLimitWithSwap = _a.sent();
+                            instructions.push(executeLimitWithSwap);
+                            return [3, 4];
+                        case 3:
+                            err_28 = _a.sent();
+                            console.log("perpClient executeLimitWithSwap 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_28;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_29;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5631,9 +5695,9 @@ var PerpetualsClient = (function () {
                         instructions.push(placeTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_28 = _a.sent();
-                        console.log("perpClient placeTriggerOrder error:: ", err_28);
-                        throw err_28;
+                        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
@@ -5642,7 +5706,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_29;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_30;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5687,9 +5751,9 @@ var PerpetualsClient = (function () {
                         instructions.push(editTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_29 = _a.sent();
-                        console.log("perpClient editTriggerOrder error:: ", err_29);
-                        throw err_29;
+                        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
@@ -5698,7 +5762,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.cancelTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_30;
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, orderAccount, cancelTriggerOrder, err_31;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5731,9 +5795,9 @@ var PerpetualsClient = (function () {
                         instructions.push(cancelTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_30 = _a.sent();
-                        console.log("perpClient cancelTriggerOrder error:: ", err_30);
-                        throw err_30;
+                        err_31 = _a.sent();
+                        console.log("perpClient cancelTriggerOrder error:: ", err_31);
+                        throw err_31;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5741,11 +5805,121 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
+        this.executeTriggerWithSwap = function (owner, targetSymbol, collateralSymbol, receivingSymbol, 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 payerPubkey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, userReceivingTokenAccount, userReceivingTokenAccountCollateral, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, _b, positionAccount, orderAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _c, custody, executeTriggerWithSwap, err_32;
+                return __generator(this, function (_d) {
+                    switch (_d.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); });
+                            receivingCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receivingSymbol).mintKey); });
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            _d.label = 1;
+                        case 1:
+                            _d.trys.push([1, 9, , 10]);
+                            if (!false) return [3, 2];
+                            return [3, 7];
+                        case 2:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(receivingSymbol).mintKey, owner, true);
+                            _a = createUserATA;
+                            if (!_a) return [3, 4];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
+                            _a = !(_d.sent());
+                            _d.label = 4;
+                        case 4:
+                            if (_a) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccount, owner, poolConfig.getTokenFromSymbol(receivingSymbol).mintKey));
+                            }
+                            userReceivingTokenAccountCollateral = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, owner, true);
+                            _b = createUserATA;
+                            if (!_b) return [3, 6];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccountCollateral, this.provider.connection)];
+                        case 5:
+                            _b = !(_d.sent());
+                            _d.label = 6;
+                        case 6:
+                            if (_b) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(payerPubkey, userReceivingTokenAccountCollateral, owner, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                            }
+                            _d.label = 7;
+                        case 7:
+                            positionAccount = poolConfig.getPositionFromMarketPk(owner, marketAccount);
+                            orderAccount = poolConfig.getOrderFromMarketPk(owner, marketAccount);
+                            custodyAccountMetas = [];
+                            custodyOracleAccountMetas = [];
+                            for (_i = 0, _c = poolConfig.custodies; _i < _c.length; _i++) {
+                                custody = _c[_i];
+                                custodyAccountMetas.push({
+                                    pubkey: custody.custodyAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyOracleAccountMetas.push({
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            return [4, this.program.methods
+                                    .executeTriggerWithSwap({
+                                    isStopLoss: isStopLoss,
+                                    orderId: orderId
+                                })
+                                    .accounts({
+                                    feePayer: payerPubkey,
+                                    receivingAccount: userReceivingTokenAccount,
+                                    receivingAccountCollateral: userReceivingTokenAccountCollateral,
+                                    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,
+                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    receivingCustody: receivingCustodyConfig.custodyAccount,
+                                    receivingOracleAccount: this.useExtOracleAccount ? receivingCustodyConfig.extOracleAccount : receivingCustodyConfig.intOracleAccount,
+                                    receivingCustodyTokenAccount: receivingCustodyConfig.tokenAccount,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
+                                    .instruction()];
+                        case 8:
+                            executeTriggerWithSwap = _d.sent();
+                            instructions.push(executeTriggerWithSwap);
+                            return [3, 10];
+                        case 9:
+                            err_32 = _d.sent();
+                            console.log("perpClient executeTriggerWithSwap error:: ", err_32);
+                            throw err_32;
+                        case 10: return [2, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
         this.executeTriggerOrder = function (owner, 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 payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_31;
+                var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, _a, positionAccount, orderAccount, executeTriggerOrder, err_33;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5808,9 +5982,9 @@ var PerpetualsClient = (function () {
                             instructions.push(executeTriggerOrder);
                             return [3, 8];
                         case 7:
-                            err_31 = _b.sent();
-                            console.log("perpClient executeTriggerOrder error:: ", err_31);
-                            throw err_31;
+                            err_33 = _b.sent();
+                            console.log("perpClient executeTriggerOrder error:: ", err_33);
+                            throw err_33;
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
@@ -5820,7 +5994,7 @@ var PerpetualsClient = (function () {
             });
         };
         this.migrateTriggerOrder = function (owner, targetSymbol, collateralSymbol, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_32;
+            var payerPubkey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, migrateTriggerOrder, err_34;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5853,9 +6027,9 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateTriggerOrder);
                         return [3, 4];
                     case 3:
-                        err_32 = _a.sent();
-                        console.log("perpClient migrateTriggerOrder error:: ", err_32);
-                        throw err_32;
+                        err_34 = _a.sent();
+                        console.log("perpClient migrateTriggerOrder error:: ", err_34);
+                        throw err_34;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5864,7 +6038,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.getPositionData = function (position, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_33;
+            var marketConfig, targetCustodyConfig, collateralCustodyConfig, getPositionData, err_35;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5893,15 +6067,15 @@ var PerpetualsClient = (function () {
                         console.log(getPositionData);
                         return [2, getPositionData];
                     case 3:
-                        err_33 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_33);
-                        throw err_33;
+                        err_35 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_35);
+                        throw err_35;
                     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_34;
+            var publicKey, custodyConfig, receivingTokenAccount, instructions, additionalSigners, withdrawFeesIx, err_36;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5934,9 +6108,9 @@ var PerpetualsClient = (function () {
                         instructions.push(withdrawFeesIx);
                         return [3, 5];
                     case 4:
-                        err_34 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_34);
-                        throw err_34;
+                        err_36 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_36);
+                        throw err_36;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5945,7 +6119,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.setPermissions = function (permissions) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_35;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPermissionsInstruction, err_37;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5972,9 +6146,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setPermissionsInstruction);
                         return [3, 4];
                     case 3:
-                        err_35 = _a.sent();
-                        console.log("perpClient setPool error:: ", err_35);
-                        throw err_35;
+                        err_37 = _a.sent();
+                        console.log("perpClient setPool error:: ", err_37);
+                        throw err_37;
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                             additionalSigners: additionalSigners
@@ -5983,7 +6157,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_36;
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_38;
             var _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -6043,9 +6217,9 @@ var PerpetualsClient = (function () {
                         instructions.push(reimburse);
                         return [3, 5];
                     case 4:
-                        err_36 = _g.sent();
-                        console.log("perpClient setPool error:: ", err_36);
-                        throw err_36;
+                        err_38 = _g.sent();
+                        console.log("perpClient setPool error:: ", err_38);
+                        throw err_38;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6054,7 +6228,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_37;
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_39;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6087,9 +6261,9 @@ var PerpetualsClient = (function () {
                         instructions.push(setInternalOraclePrice);
                         return [3, 4];
                     case 3:
-                        err_37 = _a.sent();
-                        console.log("perpClient setInternalOracleAccount error:: ", err_37);
-                        throw err_37;
+                        err_39 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_39);
+                        throw err_39;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6101,7 +6275,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_38;
+                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_40;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6224,8 +6398,8 @@ var PerpetualsClient = (function () {
                             instructions.push(addCompoundingLiquidity);
                             return [3, 10];
                         case 9:
-                            err_38 = _e.sent();
-                            console.log("perpClient addCompoundingLiquidity error:: ", err_38);
+                            err_40 = _e.sent();
+                            console.log("perpClient addCompoundingLiquidity error:: ", err_40);
                             return [3, 10];
                         case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6239,7 +6413,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_39;
+                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_41;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6346,8 +6520,8 @@ var PerpetualsClient = (function () {
                             instructions.push(removeCompoundingLiquidity);
                             return [3, 8];
                         case 7:
-                            err_39 = _e.sent();
-                            console.log("perpClient removeCompoundingLiquidity error:: ", err_39);
+                            err_41 = _e.sent();
+                            console.log("perpClient removeCompoundingLiquidity error:: ", err_41);
                             return [3, 8];
                         case 8: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6360,7 +6534,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_40;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, migrateStake, err_42;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -6441,8 +6615,8 @@ var PerpetualsClient = (function () {
                             instructions.push(migrateStake);
                             return [3, 6];
                         case 5:
-                            err_40 = _e.sent();
-                            console.log("perpClient migrateStake error:: ", err_40);
+                            err_42 = _e.sent();
+                            console.log("perpClient migrateStake error:: ", err_42);
                             return [3, 6];
                         case 6: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6453,7 +6627,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_41;
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, flpStakeAccount, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, migrateFlp, err_43;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -6525,8 +6699,8 @@ var PerpetualsClient = (function () {
                         instructions.push(migrateFlp);
                         return [3, 4];
                     case 3:
-                        err_41 = _d.sent();
-                        console.log("perpClient migrateFlp error:: ", err_41);
+                        err_43 = _d.sent();
+                        console.log("perpClient migrateFlp error:: ", err_43);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
@@ -6538,7 +6712,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_42;
+                var instructions, additionalSigners, rewardCustody, lpTokenMint, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, compoundingFee, err_44;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -6595,8 +6769,8 @@ var PerpetualsClient = (function () {
                             instructions.push(compoundingFee);
                             return [3, 4];
                         case 3:
-                            err_42 = _d.sent();
-                            console.log("perpClient compoundingFee error:: ", err_42);
+                            err_44 = _d.sent();
+                            console.log("perpClient compoundingFee error:: ", err_44);
                             return [3, 4];
                         case 4: return [2, {
                                 instructions: __spreadArray([], instructions, true),
@@ -6607,7 +6781,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_43;
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_45;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6645,8 +6819,8 @@ var PerpetualsClient = (function () {
                         instructions.push(renameFlp);
                         return [3, 4];
                     case 3:
-                        err_43 = _a.sent();
-                        console.log("perpClient renameFlp error:: ", err_43);
+                        err_45 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_45);
                         return [3, 4];
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
@@ -6656,7 +6830,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_44;
+            var publicKey, rewardMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, transferAuthority, initRewardVault, err_46;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6690,9 +6864,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_44 = _a.sent();
-                        console.log("rewardDistribution InitRewardVault error:: ", err_44);
-                        throw err_44;
+                        err_46 = _a.sent();
+                        console.log("rewardDistribution InitRewardVault error:: ", err_46);
+                        throw err_46;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6701,7 +6875,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.updateCounterReward = function () { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_45;
+            var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_47;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6724,9 +6898,9 @@ var PerpetualsClient = (function () {
                         instructions.push(updateCounter);
                         return [3, 4];
                     case 3:
-                        err_45 = _a.sent();
-                        console.log("rewardDistribution updateCounter error:: ", err_45);
-                        throw err_45;
+                        err_47 = _a.sent();
+                        console.log("rewardDistribution updateCounter error:: ", err_47);
+                        throw err_47;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6735,7 +6909,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_46;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, rewardRecord, distributeReward, err_48;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6774,9 +6948,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 4];
                     case 3:
-                        err_46 = _a.sent();
-                        console.log("rewardDistribution distributeReward error:: ", err_46);
-                        throw err_46;
+                        err_48 = _a.sent();
+                        console.log("rewardDistribution distributeReward error:: ", err_48);
+                        throw err_48;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -6787,7 +6961,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, collectRaffleReward, err_47;
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, receivingTokenAccount, _a, rewardVault, rewardTokenAccount, rewardRecord, transferAuthority, collectRaffleReward, err_49;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6835,8 +7009,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectRaffleReward);
                             return [3, 6];
                         case 5:
-                            err_47 = _b.sent();
-                            throw err_47;
+                            err_49 = _b.sent();
+                            throw err_49;
                         case 6: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners