flash-sdk 1.0.130 → 1.0.132

package/dist/PerpetualsClient.d.ts

@@ -25,7 +25,6 @@ export declare class PerpetualsClient {
     admin: PublicKey;
     programId: PublicKey;
     composabilityProgramId: PublicKey;
-    poolConfig: PoolConfig;
     multisig: {
         publicKey: PublicKey;
         bump: number;
@@ -46,7 +45,7 @@ export declare class PerpetualsClient {
     private postSendTxCallback?;
     private prioritizationFee;
     private txConfirmationCommitment;
-    constructor(provider: AnchorProvider, poolConfig: PoolConfig, composabilityProgramId: PublicKey, opts: PerpClientOptions);
+    constructor(provider: AnchorProvider, programId: PublicKey, composabilityProgramId: PublicKey, opts: PerpClientOptions);
     setPrioritizationFee: (fee: number) => void;
     loadAddressLookupTable: (poolConfig: PoolConfig) => Promise<void>;
     findProgramAddress: (label: string, extraSeeds?: any) => {
@@ -2178,10 +2177,9 @@ export declare class PerpetualsClient {
     addCustody: (poolName: string, tokenMint: PublicKey, isStable: boolean, isVirtual: boolean, oracle: OracleParams, pricing: PricingParams, permissions: Permissions, fees: Fees, borrowRate: BorrowRateParams, ratios: TokenRatios[]) => Promise<void>;
     editCustody: (poolName: string, tokenMint: PublicKey, isStable: boolean, oracle: OracleParams, pricing: PricingParams, permissions: Permissions, fees: Fees, borrowRate: BorrowRateParams, ratios: TokenRatios[]) => Promise<void>;
     removeCustody: (poolName: string, tokenMint: PublicKey, ratios: TokenRatios[]) => Promise<void>;
-    getPythnetOraclePrices: (poolConfig: PoolConfig, backupOracleSecretKey: string) => Promise<TransactionInstruction>;
-    getLiquidationState: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, collateralMint: PublicKey, side: PositionSide) => Promise<any>;
+    getLiquidationState: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, collateralMint: PublicKey, side: PositionSide, poolConfig: PoolConfig) => Promise<any>;
     validateCollectivePnl: (marketSymbol: string, collateralSymbol: string, poolConfig: PoolConfig, poolName: string, side: Side) => Promise<void>;
-    liquidate: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, collateralMint: PublicKey, side: PositionSide, receivingAccount: PublicKey, rewardsReceivingAccount: PublicKey) => Promise<string>;
+    liquidate: (wallet: PublicKey, poolConfig: PoolConfig, tokenMint: PublicKey, collateralMint: PublicKey, side: PositionSide, receivingAccount: PublicKey, rewardsReceivingAccount: PublicKey) => Promise<string>;
     getOraclePriceView: (poolName: string, tokenMint: PublicKey, ema: boolean) => Promise<any>;
     getAddLiquidityAmountAndFeeView: (poolName: string, tokenMint: PublicKey, amount: BN) => Promise<any>;
     getRemoveLiquidityAmountAndFeeView: (poolName: string, tokenMint: PublicKey, lpAmount: BN) => Promise<any>;
@@ -2209,6 +2207,7 @@ export declare class PerpetualsClient {
     getLeverageAtAmountEntryWithSwapSync: (positionAccount: PositionAccount | null, inputDeltaAmount: BN, sizeDeltaAmount: BN, side: Side, poolAccount: PoolAccount, inputTokenPrice: OraclePrice, inputTokenEmaPrice: OraclePrice, inputTokenCustodyAccount: CustodyAccount, collateralTokenPrice: OraclePrice, collateralTokenEmaPrice: OraclePrice, collateralTokenCustodyAccount: CustodyAccount, marketTokenPrice: OraclePrice, marketTokenEmaPrice: OraclePrice, marketTokenCustodyAccount: CustodyAccount, poolAumUsdMax: BN, poolConfig: PoolConfig, pnlUsd: BN) => BN;
     getEntryPriceAndFeeSync: (positionAccount: PositionAccount | null, collateralDeltaAmount: BN, sizeDeltaAmount: BN, side: Side, marketPrice: OraclePrice, marketEmaPrice: OraclePrice, marketCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN) => EntryPriceAndFee;
     getEntryPriceSync: (side: Side, marketPrice: OraclePrice, marketEmaPrice: OraclePrice, marketCustodyAccount: CustodyAccount) => BN;
+    getPriceAfterSlippage(isEntry: boolean, slippageBps: BN, marketPrice: OraclePrice, marketEmaPrice: OraclePrice, side: Side, custody: CustodyAccount): BN;
     getExitPriceAndFeeSync: (positionAccount: PositionAccount, collateralDeltaAmount: BN, sizeDeltaAmount: BN, side: Side, marketPrice: OraclePrice, marketEmaPrice: OraclePrice, marketCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN) => ExitPriceAndFee;
     getExitPriceSync: (side: Side, marketPrice: OraclePrice, marketEmaPrice: OraclePrice, marketCustodyAccount: CustodyAccount) => BN;
     getSizeAmountFromLeverageAndCollateral: (collateralAmtWithFee: BN, leverage: string, marketToken: Token, collateralToken: Token, side: Side, marketPrice: OraclePrice, marketEmaPrice: OraclePrice, marketCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount) => BN;

package/dist/PerpetualsClient.js

@@ -10,29 +10,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -97,11 +74,8 @@ var rpc_1 = require("./utils/rpc");
 var utils_1 = require("./utils");
 var constants_1 = require("./constants");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
-var backupOracle_1 = require("./backupOracle");
-var bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
-var nacl = __importStar(require("tweetnacl"));
 var PerpetualsClient = (function () {
-    function PerpetualsClient(provider, poolConfig, composabilityProgramId, opts) {
+    function PerpetualsClient(provider, programId, composabilityProgramId, opts) {
         var _this = this;
         var _a;
         this.addressLookupTables = [];
@@ -595,45 +569,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.getPythnetOraclePrices = function (poolConfig, backupOracleSecretKey) { return __awaiter(_this, void 0, void 0, function () {
-            var pythPriceIds, currentPrices, backupOracleAccount, caches_1, permissionlessPythCache, message, signature, preInstruction;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        pythPriceIds = poolConfig.custodies.map(function (f) { return f.pythPriceId; });
-                        return [4, backupOracle_1.pythPriceServiceConnection.getLatestPriceFeeds(pythPriceIds)];
-                    case 1:
-                        currentPrices = _a.sent();
-                        backupOracleAccount = web3_js_1.Keypair.fromSecretKey(bytes_1.bs58.decode(backupOracleSecretKey));
-                        if (pythPriceIds.length === currentPrices.length) {
-                            caches_1 = currentPrices.map(function (price) {
-                                var uncheckedPrice = price.getPriceUnchecked();
-                                var uncheckedEmaPrice = price.getEmaPriceUnchecked();
-                                return {
-                                    price: new anchor_1.BN(uncheckedPrice.price),
-                                    expo: uncheckedPrice.expo,
-                                    conf: new anchor_1.BN(uncheckedPrice.conf),
-                                    ema: new anchor_1.BN(uncheckedEmaPrice.price),
-                                    publishTime: new anchor_1.BN(uncheckedPrice.publishTime)
-                                };
-                            });
-                            permissionlessPythCache = {
-                                backupCache: caches_1
-                            };
-                            message = this.program._coder.types.encode('PermissionlessPythCache', permissionlessPythCache);
-                            signature = nacl.sign.detached(message, backupOracleAccount.secretKey);
-                            preInstruction = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
-                                publicKey: backupOracleAccount.publicKey.toBytes(),
-                                message: message,
-                                signature: signature,
-                            });
-                            return [2, preInstruction];
-                        }
-                        return [2];
-                }
-            });
-        }); };
-        this.getLiquidationState = function (wallet, poolName, tokenMint, collateralMint, side) { return __awaiter(_this, void 0, void 0, function () {
+        this.getLiquidationState = function (wallet, poolName, tokenMint, collateralMint, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var _a, _b;
             var _c;
             return __generator(this, function (_d) {
@@ -651,9 +587,9 @@ var PerpetualsClient = (function () {
                         return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
                     case 1:
                         _c.custodyOracleAccount = _d.sent(),
-                            _c.custodyCustomOracleAccount = this.poolConfig.backupOracle,
+                            _c.custodyCustomOracleAccount = poolConfig.backupOracle,
                             _c.collateralCustody = this.getCustodyKey(poolName, collateralMint),
-                            _c.collateralCustodyCustomOracleAccount = this.poolConfig.backupOracle;
+                            _c.collateralCustodyCustomOracleAccount = poolConfig.backupOracle;
                         return [4, this.getCustodyOracleAccountKey(poolName, collateralMint)];
                     case 2: return [4, _b.apply(_a, [(_c.collateralCustodyOracleAccount = _d.sent(),
                                 _c.ixSysvar = web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -681,10 +617,10 @@ var PerpetualsClient = (function () {
                                 pool: this.getPoolKey(poolName),
                                 custody: marketCustodyConfig.custodyAccount,
                                 custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                custodyCustomOracleAccount: poolConfig.backupOracle,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                collateralCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .remainingAccounts([])
@@ -699,12 +635,13 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.liquidate = function (wallet, poolName, tokenMint, collateralMint, side, receivingAccount, rewardsReceivingAccount) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, _b;
+        this.liquidate = function (wallet, poolConfig, tokenMint, collateralMint, side, receivingAccount, rewardsReceivingAccount) { return __awaiter(_this, void 0, void 0, function () {
+            var poolName, _a, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
+                        poolName = poolConfig.poolName;
                         _b = (_a = this.program.methods
                             .liquidate({}))
                             .accounts;
@@ -725,8 +662,8 @@ var PerpetualsClient = (function () {
                         return [4, this.getCustodyOracleAccountKey(poolName, collateralMint)];
                     case 2: return [4, _b.apply(_a, [(_c.collateralCustodyOracleAccount = _d.sent(),
                                 _c.collateralCustodyTokenAccount = this.getCustodyTokenAccountKey(poolName, collateralMint),
-                                _c.collateralCustodyCustomOracleAccount = this.poolConfig.backupOracle,
-                                _c.custodyCustomOracleAccount = this.poolConfig.backupOracle,
+                                _c.collateralCustodyCustomOracleAccount = poolConfig.backupOracle,
+                                _c.custodyCustomOracleAccount = poolConfig.backupOracle,
                                 _c.eventAuthority = this.eventAuthority.publicKey,
                                 _c.tokenProgram = spl_token_1.TOKEN_PROGRAM_ID,
                                 _c.program = this.program.programId,
@@ -1868,10 +1805,10 @@ var PerpetualsClient = (function () {
                                     position: positionAccount,
                                     custody: marketCustodyConfig.custodyAccount,
                                     custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    custodyCustomOracleAccount: poolConfig.backupOracle,
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                    collateralCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     systemProgram: web3_js_1.SystemProgram.programId,
@@ -1984,7 +1921,7 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                                 custodyCustomOracles.push({
-                                    pubkey: this.poolConfig.backupOracle,
+                                    pubkey: poolConfig.backupOracle,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -2020,16 +1957,16 @@ var PerpetualsClient = (function () {
                                     pool: poolConfig.poolAddress,
                                     receivingCustody: inputCustodyConfig.custodyAccount,
                                     receivingCustodyOracleAccount: inputCustodyConfig.oracleAddress,
-                                    receivingCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    receivingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
                                     dispensingCustody: collateralCustodyConfig.custodyAccount,
                                     dispensingCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                    dispensingCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    dispensingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     dispensingCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     position: positionAccount,
                                     custody: marketCustodyConfig.custodyAccount,
                                     custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    custodyCustomOracleAccount: poolConfig.backupOracle,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2124,10 +2061,10 @@ var PerpetualsClient = (function () {
                                     position: positionAccount,
                                     custody: marketCustodyConfig.custodyAccount,
                                     custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    custodyCustomOracleAccount: poolConfig.backupOracle,
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
                                     collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                    collateralCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2230,7 +2167,7 @@ var PerpetualsClient = (function () {
                                 isWritable: false,
                             });
                             custodyCustomOracles.push({
-                                pubkey: this.poolConfig.backupOracle,
+                                pubkey: poolConfig.backupOracle,
                                 isSigner: false,
                                 isWritable: false,
                             });
@@ -2263,16 +2200,16 @@ var PerpetualsClient = (function () {
                                 pool: poolConfig.poolAddress,
                                 receivingCustody: collateralCustodyConfig.custodyAccount,
                                 receivingCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                receivingCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                receivingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 receivingCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 dispensingCustody: outputCustodyConfig.custodyAccount,
                                 dispensingCustodyOracleAccount: outputCustodyConfig.oracleAddress,
-                                dispensingCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                dispensingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
                                 position: positionAccount,
                                 custody: marketCustodyConfig.custodyAccount,
                                 custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                custodyCustomOracleAccount: poolConfig.backupOracle,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 perpProgram: this.programId,
@@ -2450,7 +2387,7 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                                 custodyCustomOracles.push({
-                                    pubkey: this.poolConfig.backupOracle,
+                                    pubkey: poolConfig.backupOracle,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -2484,11 +2421,11 @@ var PerpetualsClient = (function () {
                                     pool: poolConfig.poolAddress,
                                     receivingCustody: userInputCustodyConfig.custodyAccount,
                                     receivingCustodyOracleAccount: userInputCustodyConfig.oracleAddress,
-                                    receivingCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    receivingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     receivingCustodyTokenAccount: userInputCustodyConfig.tokenAccount,
                                     dispensingCustody: userOutputCustodyConfig.custodyAccount,
                                     dispensingCustodyOracleAccount: userOutputCustodyConfig.oracleAddress,
-                                    dispensingCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    dispensingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2595,10 +2532,10 @@ var PerpetualsClient = (function () {
                                 pool: poolConfig.poolAddress,
                                 custody: marketCustodyConfig.custodyAccount,
                                 custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                custodyCustomOracleAccount: poolConfig.backupOracle,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                collateralCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2708,7 +2645,7 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                                 custodyCustomOracles.push({
-                                    pubkey: this.poolConfig.backupOracle,
+                                    pubkey: poolConfig.backupOracle,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -2740,15 +2677,15 @@ var PerpetualsClient = (function () {
                                     pool: poolConfig.poolAddress,
                                     receivingCustody: inputCustodyConfig.custodyAccount,
                                     receivingCustodyOracleAccount: inputCustodyConfig.oracleAddress,
-                                    receivingCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    receivingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
                                     dispensingCustody: collateralCustodyConfig.custodyAccount,
                                     dispensingCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                    dispensingCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    dispensingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                     dispensingCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     custody: marketCustodyConfig.custodyAccount,
                                     custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    custodyCustomOracleAccount: poolConfig.backupOracle,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     perpProgram: this.programId,
@@ -2842,10 +2779,10 @@ var PerpetualsClient = (function () {
                                 position: positionPubKey,
                                 custody: marketCustodyConfig.custodyAccount,
                                 custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                custodyCustomOracleAccount: poolConfig.backupOracle,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                collateralCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2949,7 +2886,7 @@ var PerpetualsClient = (function () {
                                 isWritable: false,
                             });
                             custodyCustomOracles.push({
-                                pubkey: this.poolConfig.backupOracle,
+                                pubkey: poolConfig.backupOracle,
                                 isSigner: false,
                                 isWritable: false,
                             });
@@ -2982,16 +2919,16 @@ var PerpetualsClient = (function () {
                                 pool: poolConfig.poolAddress,
                                 receivingCustody: collateralCustodyConfig.custodyAccount,
                                 receivingCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                receivingCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                receivingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 receivingCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 dispensingCustody: outputCustodyConfig.custodyAccount,
                                 dispensingCustodyOracleAccount: outputCustodyConfig.oracleAddress,
-                                dispensingCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                dispensingCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
                                 position: positionAccount,
                                 custody: marketCustodyConfig.custodyAccount,
                                 custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                custodyCustomOracleAccount: poolConfig.backupOracle,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 perpProgram: this.programId,
@@ -3041,10 +2978,10 @@ var PerpetualsClient = (function () {
                                 position: positionPubKey,
                                 custody: marketCustodyConfig.custodyAccount,
                                 custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                custodyCustomOracleAccount: poolConfig.backupOracle,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                collateralCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
@@ -3093,10 +3030,10 @@ var PerpetualsClient = (function () {
                                 position: positionPubKey,
                                 custody: marketCustodyConfig.custodyAccount,
                                 custodyOracleAccount: marketCustodyConfig.oracleAddress,
-                                custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                custodyCustomOracleAccount: poolConfig.backupOracle,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
-                                collateralCustodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                collateralCustodyCustomOracleAccount: poolConfig.backupOracle,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId,
@@ -3154,7 +3091,7 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                                 custodyCustomOracles.push({
-                                    pubkey: this.poolConfig.backupOracle,
+                                    pubkey: poolConfig.backupOracle,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -3236,7 +3173,7 @@ var PerpetualsClient = (function () {
                                     pool: poolConfig.poolAddress,
                                     custody: payTokenCustodyConfig.custodyAccount,
                                     custodyOracleAccount: payTokenCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    custodyCustomOracleAccount: poolConfig.backupOracle,
                                     custodyTokenAccount: payTokenCustodyConfig.tokenAccount,
                                     lpTokenMint: poolConfig.lpTokenMint,
                                     eventAuthority: this.eventAuthority.publicKey,
@@ -3301,7 +3238,7 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                                 custodyCustomOracles.push({
-                                    pubkey: this.poolConfig.backupOracle,
+                                    pubkey: poolConfig.backupOracle,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -3370,7 +3307,7 @@ var PerpetualsClient = (function () {
                                     pool: poolConfig.poolAddress,
                                     custody: recieveTokenCustodyConfig.custodyAccount,
                                     custodyOracleAccount: recieveTokenCustodyConfig.oracleAddress,
-                                    custodyCustomOracleAccount: this.poolConfig.backupOracle,
+                                    custodyCustomOracleAccount: poolConfig.backupOracle,
                                     custodyTokenAccount: recieveTokenCustodyConfig.tokenAccount,
                                     lpTokenMint: poolConfig.lpTokenMint,
                                     eventAuthority: this.eventAuthority.publicKey,
@@ -3405,10 +3342,9 @@ var PerpetualsClient = (function () {
         };
         this.provider = provider;
         (0, anchor_1.setProvider)(provider);
-        this.program = new anchor_1.Program(perpetuals_1.IDL, poolConfig.programId);
+        this.program = new anchor_1.Program(perpetuals_1.IDL, programId);
         this.programPerpComposability = new anchor_1.Program(perp_composability_1.IDL, composabilityProgramId);
-        this.poolConfig = poolConfig;
-        this.programId = poolConfig.programId;
+        this.programId = programId;
         this.composabilityProgramId = composabilityProgramId;
         this.admin = this.provider.wallet.publicKey;
         this.multisig = this.findProgramAddress("multisig");
@@ -3447,6 +3383,40 @@ var PerpetualsClient = (function () {
         }
         return newRatio;
     };
+    PerpetualsClient.prototype.getPriceAfterSlippage = function (isEntry, slippageBps, marketPrice, marketEmaPrice, side, custody) {
+        if (isEntry) {
+            var current_price = this.getEntryPriceSync(side, marketPrice, marketEmaPrice, custody);
+            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS));
+            if ((0, types_1.isVariant)(side, 'long')) {
+                return current_price.add(spread_i);
+            }
+            else {
+                if (spread_i.lt(current_price)) {
+                    return current_price.sub(spread_i);
+                }
+                else {
+                    return constants_1.BN_ZERO;
+                }
+                ;
+            }
+        }
+        else {
+            var current_price = this.getExitPriceSync(side, marketPrice, marketEmaPrice, custody);
+            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS));
+            if ((0, types_1.isVariant)(side, 'long')) {
+                if (spread_i.lt(current_price)) {
+                    return current_price.sub(spread_i);
+                }
+                else {
+                    return constants_1.BN_ZERO;
+                }
+                ;
+            }
+            else {
+                return current_price.add(spread_i);
+            }
+        }
+    };
     PerpetualsClient.prototype.sendTransaction = function (ixs, opts) {
         if (opts === void 0) { opts = {}; }
         return __awaiter(this, void 0, void 0, function () {

package/dist/PoolAccount.d.ts

@@ -1,9 +1,7 @@
 /// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
-import { Pool, Side, TokenRatios } from "./types";
+import { Pool, TokenRatios } from "./types";
 import { PublicKey } from "@solana/web3.js";
-import { CustodyAccount } from "./CustodyAccount";
-import { OraclePrice } from "./OraclePrice";
 export declare class PoolAccount implements Pool {
     publicKey: PublicKey;
     name: string;
@@ -17,8 +15,4 @@ export declare class PoolAccount implements Pool {
     static from(publicKey: PublicKey, parseData: Pool): PoolAccount;
     updatePoolData(parseData: Pool): void;
     getTokenId(custodyKey: PublicKey): number;
-    static getPriceAfterSlippage(isEntry: boolean, slippageBps: BN, token_price: OraclePrice, token_ema_price: OraclePrice, side: Side, custody: CustodyAccount): BN;
-    static getPrice(token_price: OraclePrice, token_ema_price: OraclePrice, side: Side, spread: BN): OraclePrice;
-    static getEntryPrice(token_price: OraclePrice, token_ema_price: OraclePrice, side: Side, custody: CustodyAccount): BN;
-    static getExitPrice(token_price: OraclePrice, token_ema_price: OraclePrice, side: Side, custody: CustodyAccount): BN;
 }

package/dist/PoolAccount.js

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PoolAccount = void 0;
-var constants_1 = require("./constants");
-var anchor_1 = require("@coral-xyz/anchor");
-var types_1 = require("./types");
-var OraclePrice_1 = require("./OraclePrice");
-var utils_1 = require("./utils");
 var PoolAccount = (function () {
     function PoolAccount(publicKey, parseData) {
         this.publicKey = publicKey;
@@ -20,90 +15,6 @@ var PoolAccount = (function () {
     PoolAccount.prototype.getTokenId = function (custodyKey) {
         return this.custodies.findIndex(function (i) { return i.toBase58() == custodyKey.toBase58(); });
     };
-    PoolAccount.getPriceAfterSlippage = function (isEntry, slippageBps, token_price, token_ema_price, side, custody) {
-        if (isEntry) {
-            var current_price = this.getEntryPrice(token_price, token_ema_price, side, custody);
-            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS));
-            if ((0, types_1.isVariant)(side, 'long')) {
-                return current_price.add(spread_i);
-            }
-            else {
-                if (spread_i.lt(current_price)) {
-                    return current_price.sub(spread_i);
-                }
-                else {
-                    return constants_1.BN_ZERO;
-                }
-                ;
-            }
-        }
-        else {
-            var current_price = this.getExitPrice(token_price, token_ema_price, side, custody);
-            var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS));
-            if ((0, types_1.isVariant)(side, 'long')) {
-                if (spread_i.lt(current_price)) {
-                    return current_price.sub(spread_i);
-                }
-                else {
-                    return constants_1.BN_ZERO;
-                }
-                ;
-            }
-            else {
-                return current_price.add(spread_i);
-            }
-        }
-    };
-    PoolAccount.getPrice = function (token_price, token_ema_price, side, spread) {
-        if ((0, types_1.isVariant)(side, 'long')) {
-            var max_price = void 0;
-            if (token_price.cmp(token_ema_price)) {
-                max_price = token_price;
-            }
-            else {
-                max_price = token_ema_price;
-            }
-            ;
-            var spread_i = (0, utils_1.checkedDecimalCeilMul)(max_price.price, max_price.exponent, spread, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), max_price.exponent);
-            return new OraclePrice_1.OraclePrice({
-                price: max_price.price.add(spread_i),
-                exponent: max_price.exponent,
-                confidence: constants_1.BN_ZERO,
-            });
-        }
-        else {
-            var min_price = void 0;
-            if (token_price.cmp(token_ema_price)) {
-                min_price = token_ema_price;
-            }
-            else {
-                min_price = token_price;
-            }
-            ;
-            var spread_i = (0, utils_1.checkedDecimalMul)(min_price.price, min_price.exponent, spread, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), min_price.exponent);
-            var price = void 0;
-            if (spread_i.lt(min_price.price)) {
-                price = min_price.price.sub(spread_i);
-            }
-            else {
-                price = constants_1.BN_ZERO;
-            }
-            ;
-            return new OraclePrice_1.OraclePrice({
-                price: price,
-                exponent: min_price.exponent,
-                confidence: constants_1.BN_ZERO,
-            });
-        }
-    };
-    PoolAccount.getEntryPrice = function (token_price, token_ema_price, side, custody) {
-        var price = PoolAccount.getPrice(token_price, token_ema_price, ((0, types_1.isVariant)(side, 'long')) ? types_1.Side.Long : types_1.Side.Short, ((0, types_1.isVariant)(side, 'long')) ? custody.pricing.tradeSpreadLong : custody.pricing.tradeSpreadShort);
-        return price.scale_to_exponent(new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS)).price;
-    };
-    PoolAccount.getExitPrice = function (token_price, token_ema_price, side, custody) {
-        var price = PoolAccount.getPrice(token_price, token_ema_price, ((0, types_1.isVariant)(side, 'long')) ? types_1.Side.Short : types_1.Side.Long, ((0, types_1.isVariant)(side, 'long')) ? custody.pricing.tradeSpreadShort : custody.pricing.tradeSpreadLong);
-        return price.scale_to_exponent(new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS)).price;
-    };
     return PoolAccount;
 }());
 exports.PoolAccount = PoolAccount;

package/dist/PoolConfig.d.ts

@@ -10,7 +10,6 @@ export interface CustodyConfig {
     isStable: boolean;
     isVirtual: boolean;
     oracleAddress: PublicKey;
-    pythPriceId: string;
 }
 export type Token = {
     symbol: string;
@@ -19,6 +18,7 @@ export type Token = {
     isStable: boolean;
     isVirtual: boolean;
     pythTicker: string;
+    pythPriceId: string;
 };
 export declare class PoolConfig {
     programId: PublicKey;
@@ -27,6 +27,7 @@ export declare class PoolConfig {
     poolAddress: PublicKey;
     lpTokenMint: PublicKey;
     lpDecimals: number;
+    lpTokenSymbol: string;
     perpetuals: PublicKey;
     transferAuthority: PublicKey;
     multisig: PublicKey;
@@ -34,7 +35,7 @@ export declare class PoolConfig {
     backupOracle: PublicKey;
     tokens: Token[];
     custodies: CustodyConfig[];
-    constructor(programId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, lpTokenMint: PublicKey, lpDecimals: number, perpetuals: PublicKey, transferAuthority: PublicKey, multisig: PublicKey, addressLookupTableAddresses: PublicKey[], backupOracle: PublicKey, tokens: Token[], custodies: CustodyConfig[]);
+    constructor(programId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, lpTokenMint: PublicKey, lpDecimals: number, lpTokenSymbol: string, perpetuals: PublicKey, transferAuthority: PublicKey, multisig: PublicKey, addressLookupTableAddresses: PublicKey[], backupOracle: PublicKey, tokens: Token[], custodies: CustodyConfig[]);
     getAllTokenMints(): PublicKey[];
     getNonStableTokens(): PublicKey[];
     getAllCustodies(): PublicKey[];