flash-sdk 12.0.3-alpha.0 → 12.0.3

package/dist/PerpetualsClient.d.ts

@@ -2,7 +2,7 @@ import { Program, AnchorProvider, BN } from "@coral-xyz/anchor";
 import { PublicKey, TransactionInstruction, Commitment, Signer, AddressLookupTableAccount, VersionedTransaction } from "@solana/web3.js";
 import { PoolAccount } from "./PoolAccount";
 import { PositionAccount } from "./PositionAccount";
-import { AddLiquidityAmountAndFee, InternalPrice, BorrowRateParams, ExitPriceAndFee, Fees, OracleParams, Permissions, PricingParams, RemoveCollateralData, RemoveLiquidityAmountAndFee, Side, TokenRatios, MinAndMaxPrice, FeesAction, ContractOraclePrice, Privilege, PerpetualsAccount, EntryPriceAndFeeV2, TokenPermissions, TokenStake, InternalEmaPrice, Whitelist } from "./types";
+import { AddLiquidityAmountAndFee, InternalPrice, BorrowRateParams, ExitPriceAndFee, Fees, OracleParams, Permissions, PricingParams, RemoveCollateralData, RemoveLiquidityAmountAndFee, Side, TokenRatios, MinAndMaxPrice, FeesAction, ContractOraclePrice, Privilege, PerpetualsAccount, EntryPriceAndFeeV2, TokenPermissions, TokenStake, InternalEmaPrice, Whitelist, VoltageMultiplier, MarketPermissions } from "./types";
 import { OraclePrice } from "./OraclePrice";
 import { CustodyAccount } from "./CustodyAccount";
 import type { Perpetuals } from './idl/perpetuals';
@@ -21,8 +21,6 @@ export interface PositionMetrics {
         profitUsd: BN;
         lossUsd: BN;
         priceImpactUsd: BN;
-        maxPriceImpactUsd: BN;
-        netProfitUsd: BN;
     };
     leverage: BN;
     liquidationPrice: OraclePrice;
@@ -693,15 +691,11 @@ export declare class PerpetualsClient {
         profitUsd: BN;
         lossUsd: BN;
         priceImpactUsd: BN;
-        maxPriceImpactUsd: BN;
-        netProfitUsd: BN;
     };
     getPnlContractHelper: (positionAccount: PositionAccount, targetTokenPrice: OraclePrice, targetTokenEmaPrice: OraclePrice, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN, delay: BN, poolConfig: PoolConfig) => {
         profitUsd: BN;
         lossUsd: BN;
         priceImpactUsd: BN;
-        maxPriceImpactUsd: BN;
-        netProfitUsd: BN;
     };
     getPositionMetrics: (positionAccount: PositionAccount, targetTokenPrice: OraclePrice, targetTokenEmaPrice: OraclePrice, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN, poolConfig: PoolConfig) => PositionMetrics;
     getPositionsMetricsBatch: (positions: Array<{
@@ -1049,4 +1043,36 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    setPerpetualsConfig: (allowUngatedTrading: boolean, voltageMultiplier: VoltageMultiplier, tradingDiscount: BN[], referralRebate: BN[], defaultRebate: BN, tradeLimit: number, triggerOrderLimit: number, rebateLimitUsd: number) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    setPoolConfig: (name: string, permissions: Permissions, maxAumUsd: BN, oracleAuthority: PublicKey, stakingFeeShareBps: BN, vpVolumeFactor: number, stakingFeeBoostBps: BN[], minLpPriceUsd: BN, maxLpPriceUsd: BN, thresholdUsd: BN) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    addCustodyToken22: (poolName: string, tokenMint: PublicKey, tokenAccountSpace: BN, token22: boolean) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    addMarket: (poolName: string, targetCustody: PublicKey, collateralCustody: PublicKey, side: Side, correlation: boolean, maxPayoffBps: BN, permissions: MarketPermissions) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    setCustody: (poolName: string, tokenMint: PublicKey, depegAdjustment: boolean, inversePrice: boolean, oracle: OracleParams, pricingConfig: PricingParams, permissions: Permissions, fees: Fees, borrowRate: BorrowRateParams, ratios: TokenRatios[], rewardThreshold: BN, minReserveUsd: BN, limitPriceBufferBps: BN, token22: boolean) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    addInternalOracle: (exponent: number, tokenMint: PublicKey, intOracleAccount: PublicKey, extOracleAccount: PublicKey) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    setMarket: (poolName: string, targetCustody: PublicKey, collateralCustody: PublicKey, marketAccount: PublicKey, maxPayoffBps: BN, permissions: MarketPermissions, correlation: boolean) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    removeMarket: (poolName: string, market: PublicKey, targetMint: PublicKey, collateralMint: PublicKey) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
 }

package/dist/PerpetualsClient.js

@@ -683,7 +683,7 @@ var PerpetualsClient = (function () {
                 currentMarginUsd = positionAccount.collateralUsd.sub(lossUsd);
             }
             else {
-                currentMarginUsd = positionAccount.collateralUsd.add(pnl.netProfitUsd).sub(lossUsd);
+                currentMarginUsd = positionAccount.collateralUsd.add(pnl.profitUsd).sub(lossUsd);
             }
             if (currentMarginUsd.gt(constants_1.BN_ZERO)) {
                 return positionAccount.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentMarginUsd);
@@ -1028,6 +1028,7 @@ var PerpetualsClient = (function () {
             positionDelta.collateralUsd = (positionAccount.collateralUsd.mul(closeRatio)).div(decimalPower);
             positionDelta.unsettledFeesUsd = (positionAccount.unsettledFeesUsd.mul(closeRatio)).div(decimalPower);
             positionDelta.degenSizeUsd = positionAccount.degenSizeUsd.mul(closeRatio).div(decimalPower);
+            positionDelta.priceImpactUsd = (positionAccount.priceImpactUsd.mul(closeRatio)).div(decimalPower);
             var newPnl = _this.getPnlSync(positionDelta, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
             var exitFeeUsd = positionDelta.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             if (discountBps.gt(constants_1.BN_ZERO)) {
@@ -1037,8 +1038,9 @@ var PerpetualsClient = (function () {
             var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionDelta, collateralCustodyAccount, currentTimestamp);
             var totalFeesUsd = (exitFeeUsd.add(lockAndUnsettledFeeUsd));
             var currentCollateralUsd = positionDelta.collateralUsd;
-            var liabilityUsd = newPnl.lossUsd.add(totalFeesUsd);
-            var assetsUsd = anchor_1.BN.min(newPnl.netProfitUsd.add(currentCollateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionDelta.lockedAmount, collateralCustodyAccount.decimals));
+            var lossLiabilityUsd = newPnl.lossUsd.add(positionDelta.priceImpactUsd);
+            var liabilityUsd = lossLiabilityUsd.add(totalFeesUsd);
+            var assetsUsd = anchor_1.BN.min(newPnl.profitUsd.add(currentCollateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionDelta.lockedAmount, collateralCustodyAccount.decimals));
             if (debugLogs) {
                 console.log("assetsUsd.sub(liabilityUsd):", collateralCustodyAccount.decimals, assetsUsd.toString(), liabilityUsd.toString(), assetsUsd.sub(liabilityUsd).toString());
             }
@@ -1066,6 +1068,7 @@ var PerpetualsClient = (function () {
             newPosition.collateralUsd = positionAccount.collateralUsd.sub(positionDelta.collateralUsd);
             newPosition.unsettledFeesUsd = positionAccount.unsettledFeesUsd.sub(positionDelta.unsettledFeesUsd);
             newPosition.degenSizeUsd = positionAccount.degenSizeUsd.sub(positionDelta.degenSizeUsd);
+            newPosition.priceImpactUsd = positionAccount.priceImpactUsd.sub(positionDelta.priceImpactUsd);
             newPosition.collateralUsd = newPosition.collateralUsd.add(closeAmountUsd);
             var feeUsdWithDiscount = constants_1.BN_ZERO;
             var feeUsd = sizeDeltaUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
@@ -1133,7 +1136,8 @@ var PerpetualsClient = (function () {
             var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
             var exitFeeUsd = positionAccount.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
-            var lossUsd = profitLoss.lossUsd.add(exitFeeUsd).add(lockAndUnsettledFeeUsd);
+            var lossLiabilityUsd = profitLoss.lossUsd.add(positionAccount.priceImpactUsd);
+            var lossUsd = lossLiabilityUsd.add(exitFeeUsd).add(lockAndUnsettledFeeUsd);
             var availableInitMarginUsd = constants_1.BN_ZERO;
             if (profitLoss.lossUsd.lt(positionAccount.collateralUsd)) {
                 availableInitMarginUsd = positionAccount.collateralUsd.sub(lossUsd);
@@ -1175,8 +1179,9 @@ var PerpetualsClient = (function () {
             var collateralAmount = collateralPrice.getTokenAmount(positionAccount.collateralUsd, collateralCustodyAccount.decimals);
             var exitPriceAndFee = _this.getExitPriceAndFeeSync(positionAccount, marketCorrelation, collateralAmount, positionAccount.sizeAmount, side, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp);
             var totalFeesUsd = (exitPriceAndFee.exitFeeUsd.add(exitPriceAndFee.borrowFeeUsd));
-            var liabilityUsd = newPnl.lossUsd.add(totalFeesUsd);
-            var assetsUsd = anchor_1.BN.min(newPnl.netProfitUsd.add(positionAccount.collateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionAccount.lockedAmount, collateralCustodyAccount.decimals));
+            var lossLiabilityUsd = newPnl.lossUsd.add(positionAccount.priceImpactUsd);
+            var liabilityUsd = lossLiabilityUsd.add(totalFeesUsd);
+            var assetsUsd = anchor_1.BN.min(newPnl.profitUsd.add(positionAccount.collateralUsd), collateralMinMaxPrice.max.getAssetAmountUsd(positionAccount.lockedAmount, collateralCustodyAccount.decimals));
             var closeAmountUsd, feesAmountUsd;
             if (assetsUsd.gt(liabilityUsd)) {
                 closeAmountUsd = assetsUsd.sub(liabilityUsd);
@@ -1230,7 +1235,8 @@ var PerpetualsClient = (function () {
             var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount);
             var exitFeeUsd = positionAccount.sizeUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
             var lockAndUnsettledFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
-            var lossUsd = profitLoss.lossUsd.add(exitFeeUsd).add(lockAndUnsettledFeeUsd);
+            var lossLiabilityUsd = profitLoss.lossUsd.add(positionAccount.priceImpactUsd);
+            var lossUsd = lossLiabilityUsd.add(exitFeeUsd).add(lockAndUnsettledFeeUsd);
             var currentCollateralUsd = positionAccount.collateralUsd;
             var availableInitMarginUsd = constants_1.BN_ZERO;
             if (profitLoss.lossUsd.lt(currentCollateralUsd)) {
@@ -1593,8 +1599,6 @@ var PerpetualsClient = (function () {
                     profitUsd: constants_1.BN_ZERO,
                     lossUsd: constants_1.BN_ZERO,
                     priceImpactUsd: constants_1.BN_ZERO,
-                    maxPriceImpactUsd: constants_1.BN_ZERO,
-                    netProfitUsd: constants_1.BN_ZERO
                 };
             }
             var side = poolConfig.getMarketConfigByPk(positionAccount.market).side;
@@ -1658,28 +1662,20 @@ var PerpetualsClient = (function () {
             if (!priceDiffProfit.exponent.eq(priceDiffLoss.exponent)) {
                 throw new Error("exponent mistach");
             }
-            var maxPriceImpactUsd = positionAccount.priceImpactUsd;
             if (priceDiffProfit.price.gt(constants_1.BN_ZERO)) {
                 var grossProfitUsd = priceDiffProfit.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals);
-                var priceImpactUsd = positionAccount.priceImpactUsd.gt(constants_1.BN_ZERO)
-                    ? anchor_1.BN.min(positionAccount.priceImpactUsd, grossProfitUsd)
-                    : constants_1.BN_ZERO;
-                var netProfitUsd = grossProfitUsd.sub(priceImpactUsd);
                 return {
                     profitUsd: grossProfitUsd,
                     lossUsd: constants_1.BN_ZERO,
-                    priceImpactUsd: priceImpactUsd,
-                    maxPriceImpactUsd: maxPriceImpactUsd,
-                    netProfitUsd: netProfitUsd,
+                    priceImpactUsd: positionAccount.priceImpactUsd,
                 };
             }
             else {
+                var grossLossUsd = priceDiffLoss.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals);
                 return {
                     profitUsd: constants_1.BN_ZERO,
-                    lossUsd: priceDiffLoss.getAssetAmountUsd(positionAccount.sizeAmount, positionAccount.sizeDecimals),
-                    priceImpactUsd: constants_1.BN_ZERO,
-                    maxPriceImpactUsd: maxPriceImpactUsd,
-                    netProfitUsd: constants_1.BN_ZERO,
+                    lossUsd: grossLossUsd,
+                    priceImpactUsd: positionAccount.priceImpactUsd,
                 };
             }
         };
@@ -1692,7 +1688,7 @@ var PerpetualsClient = (function () {
                     timestamp: constants_1.BN_ZERO
                 });
                 return {
-                    pnl: { profitUsd: constants_1.BN_ZERO, lossUsd: constants_1.BN_ZERO, priceImpactUsd: constants_1.BN_ZERO, maxPriceImpactUsd: constants_1.BN_ZERO, netProfitUsd: constants_1.BN_ZERO },
+                    pnl: { profitUsd: constants_1.BN_ZERO, lossUsd: constants_1.BN_ZERO, priceImpactUsd: constants_1.BN_ZERO },
                     leverage: constants_1.BN_ZERO,
                     liquidationPrice: zeroOraclePrice,
                     fees: { exitFeeUsd: constants_1.BN_ZERO, exitFeeAmount: constants_1.BN_ZERO, lockAndUnsettledFeeUsd: constants_1.BN_ZERO }
@@ -1717,13 +1713,11 @@ var PerpetualsClient = (function () {
                 profitUsd: pnlResult.profitUsd,
                 lossUsd: pnlResult.lossUsd,
                 priceImpactUsd: pnlResult.priceImpactUsd,
-                maxPriceImpactUsd: pnlResult.maxPriceImpactUsd,
-                netProfitUsd: pnlResult.netProfitUsd
             };
             var liquidationPrice = _this.getLiquidationPriceContractHelper(entryOraclePrice, lockAndUnsettledFeeUsd, side, targetCustodyAccount, positionAccount);
             var unsettledFeesUsd = exitFeeUsd.add(lockAndUnsettledFeeUsd);
             var lossUsd = pnl.lossUsd.add(unsettledFeesUsd);
-            var currentMarginUsd = positionAccount.collateralUsd.add(pnl.netProfitUsd).sub(lossUsd);
+            var currentMarginUsd = positionAccount.collateralUsd.add(pnl.profitUsd).sub(lossUsd);
             var leverage;
             if (currentMarginUsd.gt(constants_1.BN_ZERO)) {
                 leverage = positionAccount.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentMarginUsd);
@@ -8248,6 +8242,366 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
+        this.setPerpetualsConfig = function (allowUngatedTrading, voltageMultiplier, tradingDiscount, referralRebate, defaultRebate, tradeLimit, triggerOrderLimit, rebateLimitUsd) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPerpetualsConfigInstruction, err_68;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .setPerpetualsConfig({
+                                allowUngatedTrading: allowUngatedTrading,
+                                tradingDiscount: tradingDiscount,
+                                referralRebate: referralRebate,
+                                defaultRebate: defaultRebate,
+                                voltageMultiplier: voltageMultiplier,
+                                tradeLimit: tradeLimit,
+                                triggerOrderLimit: triggerOrderLimit,
+                                rebateLimitUsd: rebateLimitUsd,
+                            })
+                                .accountsPartial({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                            })
+                                .instruction()];
+                    case 2:
+                        setPerpetualsConfigInstruction = _a.sent();
+                        instructions.push(setPerpetualsConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_68 = _a.sent();
+                        console.log("perpClient setPerpetualsConfigInstruction error:: ", err_68);
+                        throw err_68;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setPoolConfig = function (name, permissions, maxAumUsd, oracleAuthority, stakingFeeShareBps, vpVolumeFactor, stakingFeeBoostBps, minLpPriceUsd, maxLpPriceUsd, thresholdUsd) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setPoolConfigInstruction, err_69;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        console.log(vpVolumeFactor);
+                        return [4, this.program.methods
+                                .setPoolConfig({ permissions: permissions, oracleAuthority: oracleAuthority, maxAumUsd: maxAumUsd, stakingFeeShareBps: stakingFeeShareBps, vpVolumeFactor: vpVolumeFactor, stakingFeeBoostBps: stakingFeeBoostBps, minLpPriceUsd: minLpPriceUsd, maxLpPriceUsd: maxLpPriceUsd, thresholdUsd: thresholdUsd
+                            })
+                                .accountsPartial({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                pool: this.getPoolKey(name),
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                            })
+                                .instruction()];
+                    case 2:
+                        setPoolConfigInstruction = _a.sent();
+                        instructions.push(setPoolConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_69 = _a.sent();
+                        console.log("perpClient setPoolConfigInstruction error:: ", err_69);
+                        throw err_69;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.addCustodyToken22 = function (poolName, tokenMint, tokenAccountSpace, token22) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addCustodyToken22Instruction, err_70;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .addCustodyToken22Account({
+                                tokenAccountSpace: tokenAccountSpace
+                            })
+                                .accountsPartial({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: this.authority.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                custodyTokenAccount: this.getCustodyTokenAccountKey(poolName, tokenMint),
+                                custodyTokenMint: tokenMint,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: token22 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                            })
+                                .instruction()];
+                    case 2:
+                        addCustodyToken22Instruction = _a.sent();
+                        instructions.push(addCustodyToken22Instruction);
+                        return [3, 4];
+                    case 3:
+                        err_70 = _a.sent();
+                        console.log("perpClient addCustodyToken22Instruction error:: ", err_70);
+                        throw err_70;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.addMarket = function (poolName, targetCustody, collateralCustody, side, correlation, maxPayoffBps, permissions) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, market, addMarketInstruction, err_71;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        market = web3_js_1.PublicKey.findProgramAddressSync([
+                            Buffer.from("market"),
+                            targetCustody.toBuffer(),
+                            collateralCustody.toBuffer(),
+                            (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
+                        ], this.program.programId)[0];
+                        return [4, this.program.methods
+                                .addMarket({
+                                side: side === "long" ? { long: {} } : { short: {} },
+                                correlation: correlation,
+                                maxPayoffBps: maxPayoffBps,
+                                permissions: permissions
+                            })
+                                .accountsPartial({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: this.authority.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                market: market,
+                                targetCustody: targetCustody,
+                                collateralCustody: collateralCustody,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        addMarketInstruction = _a.sent();
+                        instructions.push(addMarketInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_71 = _a.sent();
+                        console.log("perpClient addMarketInstruction error:: ", err_71);
+                        throw err_71;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setCustody = function (poolName, tokenMint, depegAdjustment, inversePrice, oracle, pricingConfig, permissions, fees, borrowRate, ratios, rewardThreshold, minReserveUsd, limitPriceBufferBps, token22) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setCustodyConfigInstruction, err_72;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .setCustodyConfig({
+                                depegAdjustment: depegAdjustment,
+                                inversePrice: inversePrice,
+                                oracle: oracle,
+                                pricing: pricingConfig,
+                                permissions: permissions,
+                                fees: fees,
+                                borrowRate: borrowRate,
+                                ratios: ratios,
+                                rewardThreshold: rewardThreshold,
+                                minReserveUsd: minReserveUsd,
+                                limitPriceBufferBps: limitPriceBufferBps,
+                                token22: token22
+                            })
+                                .accountsPartial({
+                                admin: this.admin,
+                                multisig: this.multisig.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                custody: this.getCustodyKey(poolName, tokenMint),
+                            })
+                                .instruction()];
+                    case 2:
+                        setCustodyConfigInstruction = _a.sent();
+                        instructions.push(setCustodyConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_72 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_72);
+                        throw err_72;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.addInternalOracle = function (exponent, tokenMint, intOracleAccount, extOracleAccount) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, addInternalOracleInstruction, err_73;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .addInternalOracle({
+                                expo: exponent,
+                                extOracle: extOracleAccount,
+                            })
+                                .accountsPartial({
+                                admin: this.admin,
+                                multisig: this.multisig.publicKey,
+                                custodyTokenMint: tokenMint,
+                                intOracleAccount: intOracleAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        addInternalOracleInstruction = _a.sent();
+                        instructions.push(addInternalOracleInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_73 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_73);
+                        throw err_73;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setMarket = function (poolName, targetCustody, collateralCustody, marketAccount, maxPayoffBps, permissions, correlation) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, setMarketConfigInstruction, err_74;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .setMarketConfig({
+                                maxPayoffBps: maxPayoffBps,
+                                permissions: permissions,
+                                correlation: correlation
+                            })
+                                .accountsPartial({
+                                admin: this.admin,
+                                multisig: this.multisig.publicKey,
+                                market: marketAccount,
+                                targetCustody: targetCustody,
+                                collateralCustody: collateralCustody
+                            })
+                                .instruction()];
+                    case 2:
+                        setMarketConfigInstruction = _a.sent();
+                        instructions.push(setMarketConfigInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_74 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_74);
+                        throw err_74;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.removeMarket = function (poolName, market, targetMint, collateralMint) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, removeMarketInstruction, err_75;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        preInstructions = [];
+                        instructions = [];
+                        postInstructions = [];
+                        additionalSigners = [];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .removeMarket({})
+                                .accountsPartial({
+                                admin: this.admin,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: this.authority.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                market: market,
+                                targetCustody: this.getCustodyKey(poolName, targetMint),
+                                collateralCustody: this.getCustodyKey(poolName, collateralMint),
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                            })
+                                .instruction()];
+                    case 2:
+                        removeMarketInstruction = _a.sent();
+                        instructions.push(removeMarketInstruction);
+                        return [3, 4];
+                    case 3:
+                        err_75 = _a.sent();
+                        console.log("perpClient setCustodyConfigInstruction error:: ", err_75);
+                        throw err_75;
+                    case 4: return [2, {
+                            instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
         this.provider = provider;
         (0, anchor_1.setProvider)(provider);
         var idlWithAddress = __assign(__assign({}, perpetuals_json_1.default), { address: programId.toBase58() });