flash-sdk 1.0.13 → 1.0.15

package/lib/CustodyAccount.js

@@ -46,7 +46,7 @@ var CustodyAccount = /** @class */ (function () {
             return constants_1.BN_ZERO;
         }
         var cumulative_interest = this.getCumulativeInterest(curtime);
-        console.log("cumulative_interest:", cumulative_interest.toString());
+        // console.log("cumulative_interest:",cumulative_interest.toString())
         var position_interest;
         if (cumulative_interest.gt(position.cumulativeInterestSnapshot)) {
             position_interest = cumulative_interest.sub(position.cumulativeInterestSnapshot);

package/lib/PerpetualsClient.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="bn.js" />
+/// <reference types="node" />
 import { Program, AnchorProvider, BN } from "@coral-xyz/anchor";
 import { PublicKey, TransactionInstruction, Commitment } from "@solana/web3.js";
 import { PoolAccount } from "./PoolAccount";
@@ -1935,13 +1937,13 @@ export declare class PerpetualsClient {
     getRemoveLiquidityAmountAndFee: (poolName: string, tokenMint: PublicKey, lpAmount: BN) => Promise<any>;
     getEntryPriceAndFee: (poolName: string, tokenMint: PublicKey, collateral: BN, size: BN, side: PositionSide) => Promise<any>;
     getExitPriceAndFee: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, side: PositionSide) => Promise<any>;
-    getLiquidationPrice: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, side: PositionSide, addCollateral: BN, removeCollateral: BN) => Promise<any>;
-    getLiquidationPriceTrx: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, side: PositionSide, addCollateral: BN, removeCollateral: BN) => Promise<string>;
-    getLiquidationPrice2: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, side: PositionSide, addCollateral: BN, removeCollateral: BN) => Promise<any>;
+    getLiquidationPriceView: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, side: PositionSide, addCollateral?: BN, removeCollateral?: BN) => Promise<any>;
+    getLiquidationPriceTrx: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, side: PositionSide, addCollateral?: BN, removeCollateral?: BN) => Promise<string>;
+    getLiquidationPrice: (postionKey: PublicKey, postionData: Position, tokenPrice: OraclePrice, tokenEmaPrice: OraclePrice, custodyAccount: CustodyAccount, poolAccount: PoolAccount, currentTime: BN, addCollateral?: BN, removeCollateral?: BN) => OraclePrice;
     getLiquidationState: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, side: PositionSide) => Promise<any>;
-    getPnl: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, side: PositionSide) => Promise<any>;
+    getPnlView: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, side: PositionSide) => Promise<any>;
     getPnlTrx: (wallet: PublicKey, poolName: string, tokenMint: PublicKey, side: PositionSide) => Promise<string>;
-    getPnl2: (postionKey: PublicKey, postionData: Position, tokenPrice: OraclePrice, tokenEmaPrice: OraclePrice, custodyAccount: CustodyAccount, poolAccount: PoolAccount, currentTime: BN) => {
+    getPnl: (postionKey: PublicKey, postionData: Position, tokenPrice: OraclePrice, tokenEmaPrice: OraclePrice, custodyAccount: CustodyAccount, poolAccount: PoolAccount, currentTime: BN) => {
         profit: BN;
         loss: BN;
     };
@@ -1950,7 +1952,7 @@ export declare class PerpetualsClient {
     getAumTrx: (poolName: string) => Promise<string>;
     getAumSdk: (poolAccount: PoolAccount, token_prices: OraclePrice[], token_ema_prices: OraclePrice[], custodies: CustodyAccount[], aum_calc_mode: AumCalcMode, currentTime: BN) => BN;
     openPosition: (payTokenSymbol: string, priceAfterSlippage: BN, collateral: BN, fee: BN, size: BN, side: Side, poolConfig: PoolConfig, createUserWSOLATA?: boolean) => Promise<TransactionInstruction[]>;
-    closePosition: (receivingTokenSymbol: string, priceAfterSlippage: BN, side: Side, poolConfig: PoolConfig) => Promise<TransactionInstruction[]>;
+    closePosition: (receivingTokenSymbol: string, priceAfterSlippage: BN, side: Side, poolConfig: PoolConfig, closeUsersWSOLATA?: boolean) => Promise<TransactionInstruction[]>;
     swap: (poolReceivingTokenSymbol: string, poolDispensingTokenSymbol: string, amountIn: BN, minAmountOut: BN, poolConfig: PoolConfig, unWrapSol?: boolean) => Promise<TransactionInstruction[]>;
     addLiquidity: (payTokenSymbol: string, tokenAmountIn: BN, minLpAmountOut: BN, poolConfig: PoolConfig) => Promise<TransactionInstruction[]>;
     removeLiquidity: (recieveTokenSymbol: string, liquidityAmountIn: BN, minTokenAmountOut: BN, poolConfig: PoolConfig, closeLpATA?: boolean) => Promise<TransactionInstruction[]>;

package/lib/PerpetualsClient.js

@@ -64,6 +64,7 @@ var js_sha256_1 = require("js-sha256");
 var bs58_1 = require("bs58");
 var PositionAccount_1 = require("./PositionAccount");
 var types_1 = require("./types");
+var OraclePrice_1 = require("./OraclePrice");
 var perpetuals_1 = require("./idl/perpetuals");
 var rpc_1 = require("./utils/rpc");
 var utils_1 = require("./utils");
@@ -220,7 +221,7 @@ var PerpetualsClient = /** @class */ (function () {
                 wallet,
                 pool,
                 custody,
-                side === "long" ? [1] : [0],
+                side === "long" ? [1] : [2],
             ]).publicKey;
         };
         this.getPosition = function (postionKey) { return __awaiter(_this, void 0, void 0, function () {
@@ -773,96 +774,88 @@ var PerpetualsClient = /** @class */ (function () {
                 }
             });
         }); };
-        this.getLiquidationPrice = function (wallet, poolName, tokenMint, side, addCollateral, removeCollateral) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, _b;
-            var _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        _b = (_a = this.program.methods
-                            .getLiquidationPrice({
-                            addCollateral: addCollateral,
-                            removeCollateral: removeCollateral,
-                        }))
-                            .accounts;
-                        _c = {
-                            perpetuals: this.perpetuals.publicKey,
-                            pool: this.getPoolKey(poolName),
-                            position: this.getPositionKey(wallet, poolName, tokenMint, side),
-                            custody: this.getCustodyKey(poolName, tokenMint)
-                        };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
-                                _c)])
-                            .view()
-                            .catch(function (err) {
-                            console.error(err);
-                            throw err;
-                        })];
-                    case 2: return [2 /*return*/, _d.sent()];
-                }
-            });
-        }); };
-        this.getLiquidationPriceTrx = function (wallet, poolName, tokenMint, side, addCollateral, removeCollateral) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, _b;
-            var _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        _b = (_a = this.program.methods
-                            .getLiquidationPrice({
-                            addCollateral: addCollateral,
-                            removeCollateral: removeCollateral,
-                        }))
-                            .accounts;
-                        _c = {
-                            perpetuals: this.perpetuals.publicKey,
-                            pool: this.getPoolKey(poolName),
-                            position: this.getPositionKey(wallet, poolName, tokenMint, side),
-                            custody: this.getCustodyKey(poolName, tokenMint)
-                        };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
-                                _c)])
-                            .rpc()
-                            .catch(function (err) {
-                            console.error(err);
-                            throw err;
-                        })];
-                    case 2: return [2 /*return*/, _d.sent()];
-                }
+        this.getLiquidationPriceView = function (wallet, poolName, tokenMint, side, addCollateral, removeCollateral) {
+            if (addCollateral === void 0) { addCollateral = new anchor_1.BN(0); }
+            if (removeCollateral === void 0) { removeCollateral = new anchor_1.BN(0); }
+            return __awaiter(_this, void 0, void 0, function () {
+                var _a, _b;
+                var _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            _b = (_a = this.program.methods
+                                .getLiquidationPrice({
+                                addCollateral: addCollateral,
+                                removeCollateral: removeCollateral,
+                            }))
+                                .accounts;
+                            _c = {
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                position: this.getPositionKey(wallet, poolName, tokenMint, side),
+                                custody: this.getCustodyKey(poolName, tokenMint)
+                            };
+                            return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                        case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                                    _c)])
+                                .view()
+                                .catch(function (err) {
+                                console.error(err);
+                                throw err;
+                            })];
+                        case 2: return [2 /*return*/, _d.sent()];
+                    }
+                });
             });
-        }); };
-        this.getLiquidationPrice2 = function (wallet, poolName, tokenMint, side, addCollateral, removeCollateral) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, _b;
-            var _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        _b = (_a = this.program.methods
-                            .getLiquidationPrice({
-                            addCollateral: addCollateral,
-                            removeCollateral: removeCollateral,
-                        }))
-                            .accounts;
-                        _c = {
-                            perpetuals: this.perpetuals.publicKey,
-                            pool: this.getPoolKey(poolName),
-                            position: this.getPositionKey(wallet, poolName, tokenMint, side),
-                            custody: this.getCustodyKey(poolName, tokenMint)
-                        };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
-                                _c)])
-                            .view()
-                            .catch(function (err) {
-                            console.error(err);
-                            throw err;
-                        })];
-                    case 2: return [2 /*return*/, _d.sent()];
-                }
+        };
+        this.getLiquidationPriceTrx = function (wallet, poolName, tokenMint, side, addCollateral, removeCollateral) {
+            if (addCollateral === void 0) { addCollateral = new anchor_1.BN(0); }
+            if (removeCollateral === void 0) { removeCollateral = new anchor_1.BN(0); }
+            return __awaiter(_this, void 0, void 0, function () {
+                var _a, _b;
+                var _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            _b = (_a = this.program.methods
+                                .getLiquidationPrice({
+                                addCollateral: addCollateral,
+                                removeCollateral: removeCollateral,
+                            }))
+                                .accounts;
+                            _c = {
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                position: this.getPositionKey(wallet, poolName, tokenMint, side),
+                                custody: this.getCustodyKey(poolName, tokenMint)
+                            };
+                            return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                        case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                                    _c)])
+                                .rpc()
+                                .catch(function (err) {
+                                console.error(err);
+                                throw err;
+                            })];
+                        case 2: return [2 /*return*/, _d.sent()];
+                    }
+                });
             });
-        }); };
+        };
+        // TODO: currently just static, need to write 
+        this.getLiquidationPrice = function (postionKey, postionData, tokenPrice, tokenEmaPrice, custodyAccount, poolAccount, currentTime, addCollateral, removeCollateral) {
+            if (addCollateral === void 0) { addCollateral = new anchor_1.BN(0); }
+            if (removeCollateral === void 0) { removeCollateral = new anchor_1.BN(0); }
+            // const positionAccount = PositionAccount.from(postionKey, postionData);
+            var x;
+            if ((0, types_1.isVariant)(postionData.side, 'long')) {
+                x = tokenPrice.price.mul(new anchor_1.BN(90)).div(new anchor_1.BN(90));
+            }
+            else {
+                x = tokenPrice.price.mul(new anchor_1.BN(100)).div(new anchor_1.BN(90));
+            }
+            return new OraclePrice_1.OraclePrice({ price: x, exponent: tokenPrice.exponent });
+        };
         this.getLiquidationState = function (wallet, poolName, tokenMint, side) { return __awaiter(_this, void 0, void 0, function () {
             var _a, _b;
             var _c;
@@ -890,7 +883,7 @@ var PerpetualsClient = /** @class */ (function () {
                 }
             });
         }); };
-        this.getPnl = function (wallet, poolName, tokenMint, side) { return __awaiter(_this, void 0, void 0, function () {
+        this.getPnlView = function (wallet, poolName, tokenMint, side) { return __awaiter(_this, void 0, void 0, function () {
             var pos, _a, _b;
             var _c;
             return __generator(this, function (_d) {
@@ -948,7 +941,7 @@ var PerpetualsClient = /** @class */ (function () {
                 }
             });
         }); };
-        this.getPnl2 = function (postionKey, postionData, tokenPrice, tokenEmaPrice, custodyAccount, poolAccount, currentTime) {
+        this.getPnl = function (postionKey, postionData, tokenPrice, tokenEmaPrice, custodyAccount, poolAccount, currentTime) {
             var positionAccount = PositionAccount_1.PositionAccount.from(postionKey, postionData);
             // console.log("positionAccount:",positionAccount);
             // console.log("side :", postionData.side, (isVariant(postionData.side, 'long')))
@@ -1043,7 +1036,8 @@ var PerpetualsClient = /** @class */ (function () {
         // TODO:  handle SOL wrapping to WSOL and create a ATA - DONE
         // TODO:  Balance checks - DONE
         // TODO:  ATA check - else create  - DONE 
-        // TODO:  for close Accounts - NOT NEEDED
+        // Create WSOL Token account and not ATA and close it in end 
+        // TODO:  close other Accounts - NOT NEEDED
         this.openPosition = function (payTokenSymbol, priceAfterSlippage, collateral, fee, size, side, poolConfig, createUserWSOLATA // if false will also skip balance checks 
         ) {
             if (createUserWSOLATA === void 0) { createUserWSOLATA = true; }
@@ -1174,68 +1168,72 @@ var PerpetualsClient = /** @class */ (function () {
         // TODO: ATA check - else create  - DONE 
         // TODO: for close Accounts - DONE BY ANCHOR
         // TODO : if out token WSOL -> unwrap to SOL - DONE
-        this.closePosition = function (receivingTokenSymbol, priceAfterSlippage, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, userReceivingTokenAccount, instructions, receivingTokenCustody, positionAccount, params, instruction, closeWsolATAIns, error_3;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        console.log("close position :::", receivingTokenSymbol, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey.toBase58());
-                        publicKey = this.provider.wallet.publicKey;
-                        return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey, publicKey)];
-                    case 1:
-                        userReceivingTokenAccount = _a.sent();
-                        instructions = [];
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 5, , 6]);
-                        return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                    case 3:
-                        if (!(_a.sent())) {
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey));
-                        }
-                        receivingTokenCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey); });
-                        positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                            Buffer.from("position"),
-                            publicKey.toBuffer(),
-                            poolConfig.poolAddress.toBuffer(),
-                            receivingTokenCustody.custodyAccount.toBuffer(),
-                            (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
-                        ], this.programId)[0];
-                        console.log("positionAccount:", positionAccount.toBase58());
-                        params = {
-                            price: priceAfterSlippage,
-                        };
-                        return [4 /*yield*/, this.program.methods
-                                .closePosition(params)
-                                .accounts({
-                                owner: publicKey,
-                                receivingAccount: userReceivingTokenAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                position: positionAccount,
-                                custody: receivingTokenCustody.custodyAccount,
-                                custodyOracleAccount: receivingTokenCustody.oracleAddress,
-                                custodyTokenAccount: receivingTokenCustody.tokenAccount,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                            }).instruction()];
-                    case 4:
-                        instruction = _a.sent();
-                        instructions.push(instruction);
-                        // SOL is only retrievable by closing the token account and choosing the desired address to send the token account's lamports.
-                        if (receivingTokenSymbol == 'SOL') {
-                            closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
-                            instructions.push(closeWsolATAIns);
-                        }
-                        return [3 /*break*/, 6];
-                    case 5:
-                        error_3 = _a.sent();
-                        console.error("perpclient closePosition error:", error_3);
-                        return [3 /*break*/, 6];
-                    case 6: return [2 /*return*/, instructions];
-                }
+        this.closePosition = function (receivingTokenSymbol, priceAfterSlippage, side, poolConfig, closeUsersWSOLATA // to get back WSOL=>SOL
+        ) {
+            if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, userReceivingTokenAccount, instructions, receivingTokenCustody, positionAccount, params, instruction, closeWsolATAIns, error_3;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            console.log("close position :::", receivingTokenSymbol, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey.toBase58());
+                            publicKey = this.provider.wallet.publicKey;
+                            return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey, publicKey)];
+                        case 1:
+                            userReceivingTokenAccount = _a.sent();
+                            instructions = [];
+                            _a.label = 2;
+                        case 2:
+                            _a.trys.push([2, 5, , 6]);
+                            return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 3:
+                            if (!(_a.sent())) {
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey));
+                            }
+                            receivingTokenCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey); });
+                            positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
+                                Buffer.from("position"),
+                                publicKey.toBuffer(),
+                                poolConfig.poolAddress.toBuffer(),
+                                receivingTokenCustody.custodyAccount.toBuffer(),
+                                (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
+                            ], this.programId)[0];
+                            console.log("positionAccount:", positionAccount.toBase58());
+                            params = {
+                                price: priceAfterSlippage,
+                            };
+                            return [4 /*yield*/, this.program.methods
+                                    .closePosition(params)
+                                    .accounts({
+                                    owner: publicKey,
+                                    receivingAccount: userReceivingTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionAccount,
+                                    custody: receivingTokenCustody.custodyAccount,
+                                    custodyOracleAccount: receivingTokenCustody.oracleAddress,
+                                    custodyTokenAccount: receivingTokenCustody.tokenAccount,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                }).instruction()];
+                        case 4:
+                            instruction = _a.sent();
+                            instructions.push(instruction);
+                            // SOL is only retrievable by closing the token account and choosing the desired address to send the token account's lamports.
+                            if (receivingTokenSymbol == 'SOL' && closeUsersWSOLATA) {
+                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
+                                instructions.push(closeWsolATAIns);
+                            }
+                            return [3 /*break*/, 6];
+                        case 5:
+                            error_3 = _a.sent();
+                            console.error("perpclient closePosition error:", error_3);
+                            return [3 /*break*/, 6];
+                        case 6: return [2 /*return*/, instructions];
+                    }
+                });
             });
-        }); };
+        };
         // TODO: ATA check - else create  - DONE 
         // TODO: handle SOL wrapping to WSOL and create a ATA - DONE
         // TODO : Balance checks - NOT NEEDED
@@ -1466,35 +1464,33 @@ var PerpetualsClient = /** @class */ (function () {
                             throw "Insufficient Funds";
                         }
                         _f.label = 15;
-                    case 15:
-                        console.log("in add liq", tokenAmountIn);
-                        return [4 /*yield*/, this.program.methods
-                                .addLiquidity({
-                                amountIn: tokenAmountIn,
-                                minLpAmountOut: minLpAmountOut
-                            })
-                                .accounts({
-                                owner: publicKey,
-                                fundingAccount: userPayingTokenAccount,
-                                lpTokenAccount: lpTokenAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                custody: payTokenCustody.custodyAccount,
-                                custodyOracleAccount: payTokenCustody.oracleAddress,
-                                custodyTokenAccount: payTokenCustody.tokenAccount,
-                                lpTokenMint: poolConfig.lpTokenMint,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
-                                .instruction()];
+                    case 15: return [4 /*yield*/, this.program.methods
+                            .addLiquidity({
+                            amountIn: tokenAmountIn,
+                            minLpAmountOut: minLpAmountOut
+                        })
+                            .accounts({
+                            owner: publicKey,
+                            fundingAccount: userPayingTokenAccount,
+                            lpTokenAccount: lpTokenAccount,
+                            transferAuthority: poolConfig.transferAuthority,
+                            perpetuals: poolConfig.perpetuals,
+                            pool: poolConfig.poolAddress,
+                            custody: payTokenCustody.custodyAccount,
+                            custodyOracleAccount: payTokenCustody.oracleAddress,
+                            custodyTokenAccount: payTokenCustody.tokenAccount,
+                            lpTokenMint: poolConfig.lpTokenMint,
+                            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                        })
+                            .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
+                            .instruction()];
                     case 16:
                         inx = _f.sent();
                         instructions.push(inx);
                         return [3 /*break*/, 18];
                     case 17:
                         err_3 = _f.sent();
-                        console.log("perpClient addLiquidity error:: ", err_3);
+                        console.error("perpClient addLiquidity error:: ", err_3);
                         throw err_3;
                     case 18: return [2 /*return*/, instructions];
                 }

package/lib/PoolAccount.js

@@ -80,10 +80,10 @@ var PoolAccount = /** @class */ (function () {
     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);
-            console.log("getEntryPrice current_price:", current_price.toString());
+            // console.log("getEntryPrice current_price:",current_price.toString())
             // TODO:: checked USE
             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));
-            console.log("getPriceAfterSlippage spread_i:", spread_i.toString());
+            // console.log("getPriceAfterSlippage spread_i:",spread_i.toString());
             if ((0, types_1.isVariant)(side, 'long')) {
                 return current_price.add(spread_i);
             }
@@ -100,10 +100,10 @@ var PoolAccount = /** @class */ (function () {
         else {
             // Opp in during close
             var current_price = this.getExitPrice(token_price, token_ema_price, side, custody);
-            console.log("getExitPrice current_price:", current_price.toString());
+            // console.log("getExitPrice current_price:",current_price.toString())
             // TODO:: checked USE
             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));
-            console.log("spread_i:", spread_i);
+            // console.log("spread_i:",spread_i);
             if ((0, types_1.isVariant)(side, 'long')) {
                 if (spread_i.lt(current_price)) {
                     return current_price.sub(spread_i);
@@ -120,7 +120,7 @@ var PoolAccount = /** @class */ (function () {
     };
     PoolAccount.getPrice = function (token_price, token_ema_price, side, spread) {
         if ((0, types_1.isVariant)(side, 'long')) {
-            console.log("inside long");
+            // console.log("inside long")
             var max_price = void 0;
             if (token_price.cmp(token_ema_price)) {
                 max_price = token_price;
@@ -130,14 +130,14 @@ var PoolAccount = /** @class */ (function () {
             }
             ;
             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);
-            console.log("getPrice spread_i:", spread_i.toString());
+            // console.log("getPrice spread_i:",spread_i.toString());
             return new OraclePrice_1.OraclePrice({
                 price: max_price.price.add(spread_i),
                 exponent: max_price.exponent,
             });
         }
         else {
-            console.log("inside short ");
+            // console.log("inside short ")
             var min_price = void 0;
             if (token_price.cmp(token_ema_price)) {
                 min_price = token_ema_price;
@@ -147,7 +147,7 @@ var PoolAccount = /** @class */ (function () {
             }
             ;
             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);
-            console.log("spread_i:", spread_i.toString());
+            // console.log("spread_i:",spread_i.toString())
             var price = void 0;
             if (spread_i.lt(min_price.price)) {
                 price = min_price.price.sub(spread_i);
@@ -179,9 +179,9 @@ var PoolAccount = /** @class */ (function () {
         }
         ;
         var exit_price = PoolAccount.getExitPrice(token_price, token_ema_price, position.side, custody);
-        console.log("exit_price:", exit_price, exit_price === null || exit_price === void 0 ? void 0 : exit_price.toString());
+        // console.log("exit_price:",exit_price, exit_price?.toString())
         var size = token_ema_price.getTokenAmount(position.sizeUsd, custody.decimals);
-        console.log("size:", size, size === null || size === void 0 ? void 0 : size.toString());
+        // console.log("size:",size, size?.toString())
         var exit_fee;
         if (liquidation) {
             exit_fee = this.getLiquidationFee(size, custody);
@@ -190,13 +190,13 @@ var PoolAccount = /** @class */ (function () {
             exit_fee = this.getExitFee(size, custody);
         }
         ;
-        console.log("exit_fee:", exit_fee.toString());
+        // console.log("exit_fee:",exit_fee.toString())
         var exit_fee_usd = token_ema_price.getAssetAmountUsd(exit_fee, custody.decimals);
-        console.log("exit_fee_usd:", exit_fee_usd.toString());
+        // console.log("exit_fee_usd:",exit_fee_usd.toString())
         var interest_usd = custody.getInterestAmountUsd(position, curtime);
-        console.log("interest_usd:", interest_usd.toString());
+        // console.log("interest_usd:",interest_usd.toString())
         var unrealized_loss_usd = (exit_fee_usd.add(interest_usd)).add(position.unrealizedLossUsd);
-        console.log("unrealized_loss_usd:", unrealized_loss_usd.toString());
+        // console.log("unrealized_loss_usd:",unrealized_loss_usd.toString())
         var price_diff_profit, price_diff_loss;
         if ((0, types_1.isVariant)(position.side, 'long')) {
             if (exit_price.gt(position.price)) {
@@ -217,19 +217,19 @@ var PoolAccount = /** @class */ (function () {
             price_diff_loss = exit_price.sub(position.price);
         }
         ;
-        console.log("1 price_diff_profit:", price_diff_profit.toString());
-        console.log("2 price_diff_loss:", price_diff_loss.toString());
+        // console.log("1 price_diff_profit:",price_diff_profit.toString())
+        // console.log("2 price_diff_loss:",price_diff_loss.toString())
         var position_price = (0, utils_1.scaleToExponent)(position.price, new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS), new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
-        console.log("position_price:", position_price.toString());
+        // console.log("position_price:",position_price.toString())
         if (price_diff_profit.gt(constants_1.BN_ZERO)) {
             var potential_profit_usd = (position.sizeUsd.mul(price_diff_profit)).div(position_price);
             potential_profit_usd = potential_profit_usd.add(position.unrealizedProfitUsd);
-            console.log("potential_profit_usd:", potential_profit_usd.toString());
+            // console.log("potential_profit_usd:",potential_profit_usd.toString())
             if (potential_profit_usd.gte(unrealized_loss_usd)) {
                 var cur_profit_usd = potential_profit_usd.sub(unrealized_loss_usd);
                 var max_profit_usd = min_price.getAssetAmountUsd(position.lockedAmount, custody.decimals);
-                console.log("cur_profit_usd:", cur_profit_usd.toString());
-                console.log("max_profit_usd:", max_profit_usd.toString());
+                // console.log("cur_profit_usd:",cur_profit_usd.toString())
+                // console.log("max_profit_usd:",max_profit_usd.toString())
                 return {
                     profit: anchor_1.BN.min(max_profit_usd, cur_profit_usd),
                     loss: constants_1.BN_ZERO,
@@ -237,8 +237,8 @@ var PoolAccount = /** @class */ (function () {
                 };
             }
             else {
-                console.log(" -- unrealized_loss_usd:", unrealized_loss_usd.toString());
-                console.log(" -- potential_profit_usd:", potential_profit_usd.toString());
+                // console.log(" -- unrealized_loss_usd:",unrealized_loss_usd.toString())
+                // console.log(" -- potential_profit_usd:",potential_profit_usd.toString())
                 return {
                     profit: constants_1.BN_ZERO,
                     loss: unrealized_loss_usd.sub(potential_profit_usd),
@@ -249,9 +249,9 @@ var PoolAccount = /** @class */ (function () {
         else {
             var potential_loss_usd = (0, utils_1.checkedCeilDiv)(position.sizeUsd.mul(price_diff_loss), position_price);
             potential_loss_usd = potential_loss_usd.add(unrealized_loss_usd);
-            console.log("potential_loss_usd:", potential_loss_usd.toString());
+            //  console.log("potential_loss_usd:",potential_loss_usd.toString())
             if (potential_loss_usd.gte(position.unrealizedProfitUsd)) {
-                console.log("position.unrealizedProfitUsd:", position.unrealizedProfitUsd.toString());
+                //  console.log("position.unrealizedProfitUsd:",position.unrealizedProfitUsd.toString())
                 return {
                     profit: constants_1.BN_ZERO,
                     loss: potential_loss_usd.sub(position.unrealizedProfitUsd),
@@ -261,8 +261,8 @@ var PoolAccount = /** @class */ (function () {
             else {
                 var cur_profit_usd = position.unrealizedProfitUsd.sub(potential_loss_usd);
                 var max_profit_usd = min_price.getAssetAmountUsd(position.lockedAmount, custody.decimals);
-                console.log("cur_profit_usd:", cur_profit_usd.toString());
-                console.log("max_profit_usd:", max_profit_usd.toString());
+                //  console.log("cur_profit_usd:",cur_profit_usd.toString())
+                //  console.log("max_profit_usd:",max_profit_usd.toString())
                 return {
                     profit: anchor_1.BN.min(max_profit_usd, cur_profit_usd),
                     loss: constants_1.BN_ZERO,