flash-sdk 2.30.2 → 2.31.1

package/dist/PerpetualsClient.d.ts

@@ -4018,6 +4018,10 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    swapAndAddCollateral: (targetSymbol: string, inputSymbol: string, collateralSymbol: string, amountIn: BN, minCollateralAmountOut: BN, side: Side, positionPubKey: PublicKey, poolConfig: PoolConfig, skipBalanceChecks?: boolean, ephemeralSignerPubkey?: any) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
     removeCollateral: (collateralWithFee: BN, marketSymbol: string, collateralSymbol: string, side: Side, positionPubKey: PublicKey, poolConfig: PoolConfig, createUserATA?: boolean, closeUsersWSOLATA?: boolean, ephemeralSignerPubkey?: any) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
@@ -4026,6 +4030,10 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    removeCollateralAndSwap: (targetSymbol: string, collateralSymbol: string, outputSymbol: string, minSwapAmountOut: BN, collateralDelta: BN, side: Side, poolConfig: PoolConfig, ephemeralSignerPubkey?: any) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
     increaseSize: (targetSymbol: string, collateralSymbol: string, positionPubKey: PublicKey, side: Side, poolConfig: PoolConfig, priceWithSlippage: ContractOraclePrice, sizeDelta: BN, privilege: Privilege, nftTradingAccount?: PublicKey, nftReferralAccount?: PublicKey, nftRebateTokenAccount?: PublicKey) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];

package/dist/PerpetualsClient.js

@@ -798,7 +798,7 @@ var PerpetualsClient = (function () {
                 divergenceBps = price.getDivergenceFactor(emaPrice);
             }
             if (divergenceBps.gte(custodyAccount.oracle.maxDivergenceBps)) {
-                var factorBps = (divergenceBps.mul(new anchor_1.BN(constants_1.BPS_POWER))).div(custodyAccount.oracle.maxDivergenceBps);
+                var factorBps = custodyAccount.oracle.maxDivergenceBps.isZero ? constants_1.BN_ZERO : (divergenceBps.mul(new anchor_1.BN(constants_1.BPS_POWER))).div(custodyAccount.oracle.maxDivergenceBps);
                 var confBps = (price.confidence.muln(constants_1.BPS_POWER)).div(price.price);
                 if (confBps.lt(custodyAccount.oracle.maxConfBps)) {
                     var confFactor = anchor_1.BN.min(factorBps, new anchor_1.BN(50000));
@@ -1285,8 +1285,7 @@ var PerpetualsClient = (function () {
             newPosition.sizeUsd = positionAccount.sizeUsd.sub(positionDelta.sizeUsd);
             newPosition.lockedUsd = positionAccount.lockedUsd.sub(positionDelta.lockedUsd);
             newPosition.lockedAmount = positionAccount.lockedAmount.sub(positionDelta.lockedAmount);
-            newPosition.unsettledFeesUsd = positionAccount.unsettledFeesUsd.sub(positionDelta.unsettledFeesUsd);
-            newPosition.collateralAmount = positionAccount.collateralAmount.sub(positionDelta.collateralAmount).add(closeAmount);
+            newPosition.collateralAmount = positionAccount.collateralAmount.sub(closeAmount);
             newPosition.collateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(newPosition.collateralAmount, collateralCustodyAccount.decimals);
             var feeUsdWithDiscount = constants_1.BN_ZERO;
             var feeUsd = sizeDeltaUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
@@ -1303,44 +1302,34 @@ var PerpetualsClient = (function () {
                 var exitFee = _this.getExitFeeSync(positionAccount, targetCustodyAccount, collateralCustodyAccount, collateralPrice, collateralEmaPrice);
                 var lockAndUnsettledFeeUsd_1 = _this.getLockFeeAndUnsettledUsdForPosition(positionAccount, collateralCustodyAccount, currentTimestamp);
                 var pnlUsdWithFee = pnlUsd.sub(lockAndUnsettledFeeUsd_1).sub(exitFee.exitFeeUsd);
-                var currentlev = _this.getLeverageSync(positionAccount.sizeUsd, positionAccount.collateralAmount, collateralMinMaxPrice.min, collateralCustodyAccount.decimals, pnlUsdWithFee);
-                var collateralAmountRecievedUsd = newPosition.collateralUsd.sub(newPosition.sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentlev));
-                var collateralAmountReceived = collateralMinMaxPrice.max.getTokenAmount(collateralAmountRecievedUsd, collateralCustodyAccount.decimals);
-                var maxWithdrawableAmount = _this.getMaxWithdrawableAmountSync(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig);
+                var collateralAmountReceived = closeAmount;
+                var collateralAmountRecievedUsd = collateralMinMaxPrice.min.getAssetAmountUsd(collateralAmountReceived, collateralCustodyAccount.decimals);
                 if (collateralAmountReceived.lt(constants_1.BN_ZERO)) {
                     collateralAmountReceived = constants_1.BN_ZERO;
                     collateralAmountRecievedUsd = constants_1.BN_ZERO;
                 }
-                else if (collateralAmountReceived.gt(maxWithdrawableAmount)) {
-                    collateralAmountReceived = maxWithdrawableAmount;
-                    collateralAmountRecievedUsd = collateralMinMaxPrice.min.getAssetAmountUsd(maxWithdrawableAmount, collateralCustodyAccount.decimals);
-                }
-                if (discountBps.gt(constants_1.BN_ZERO)) {
-                    var discount = collateralAmountRecievedUsd.mul(discountBps).div(new anchor_1.BN(constants_1.BPS_POWER));
-                    collateralAmountRecievedUsd = exitFeeUsd.sub(discount);
-                }
-                newPosition.collateralAmount = newPosition.collateralAmount.sub(collateralAmountReceived);
-                newPosition.collateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(newPosition.collateralAmount, collateralCustodyAccount.decimals);
                 var entryPrice = OraclePrice_1.OraclePrice.from({ price: newPosition.entryPrice.price, exponent: new anchor_1.BN(newPosition.entryPrice.exponent), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
                 var finalInterestUsd = _this.getLockFeeAndUnsettledUsdForPosition(newPosition, collateralCustodyAccount, currentTimestamp);
                 var finalLiquidationPrice = _this.getLiquidationPriceSync(newPosition.collateralAmount, newPosition.sizeAmount, entryPrice, finalInterestUsd, marketCorrelation, side, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, newPosition);
                 var finalPnl = _this.getPnlSync(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
                 var finalPnlUsd = finalPnl.profitUsd.sub(finalPnl.lossUsd);
-                var newExitFee = _this.getExitFeeSync(newPosition, targetCustodyAccount, collateralCustodyAccount, collateralPrice, collateralEmaPrice);
-                var finalPnlUsdWithFee = finalPnlUsd.sub(finalInterestUsd).sub(newExitFee.exitFeeUsd);
-                var newLev = _this.getLeverageSync(newPosition.sizeUsd, newPosition.collateralAmount, collateralMinMaxPrice.min, collateralCustodyAccount.decimals, finalPnlUsdWithFee);
+                var newLev = _this.getLeverageSync(newPosition.sizeUsd, newPosition.collateralAmount, collateralMinMaxPrice.min, collateralCustodyAccount.decimals, constants_1.BN_ZERO);
                 return {
                     newSizeUsd: newPosition.sizeUsd,
-                    feeUsd: feeUsd.add(collateralAmountRecievedUsd),
+                    feeUsd: feeUsd,
                     feeUsdWithDiscount: feeUsdWithDiscount.add(collateralAmountRecievedUsd),
                     newLev: newLev,
                     liquidationPrice: finalLiquidationPrice,
                     collateralAmountRecieved: collateralAmountReceived,
                     newCollateralAmount: newPosition.collateralAmount,
-                    newPnl: finalPnl.profitUsd.sub(finalPnl.lossUsd)
+                    newPnl: finalPnlUsd
                 };
             }
             else {
+                var collateralAmountReceived = closeAmount.sub(positionDelta.collateralAmount);
+                if (collateralAmountReceived.lte(constants_1.BN_ZERO)) {
+                    collateralAmountReceived = constants_1.BN_ZERO;
+                }
                 var entryPrice = OraclePrice_1.OraclePrice.from({ price: newPosition.entryPrice.price, exponent: new anchor_1.BN(newPosition.entryPrice.exponent), confidence: constants_1.BN_ZERO, timestamp: constants_1.BN_ZERO });
                 var finalInterestUsd = _this.getLockFeeAndUnsettledUsdForPosition(newPosition, collateralCustodyAccount, currentTimestamp);
                 var finalLiquidationPrice = _this.getLiquidationPriceSync(newPosition.collateralAmount, newPosition.sizeAmount, entryPrice, finalInterestUsd, marketCorrelation, side, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, newPosition);
@@ -1350,10 +1339,6 @@ var PerpetualsClient = (function () {
                 var lockFeeUsd = _this.getLockFeeAndUnsettledUsdForPosition(newPosition, collateralCustodyAccount, currentTimestamp);
                 var finalPnlUsdWithFee = finalPnlUsd.sub(lockFeeUsd).sub(exitFee.exitFeeUsd);
                 var newLev = _this.getLeverageSync(newPosition.sizeUsd, newPosition.collateralAmount, collateralMinMaxPrice.min, collateralCustodyAccount.decimals, finalPnlUsdWithFee);
-                var collateralAmountReceived = newPosition.collateralAmount.sub(positionAccount.collateralAmount);
-                if (collateralAmountReceived.lte(constants_1.BN_ZERO)) {
-                    collateralAmountReceived = constants_1.BN_ZERO;
-                }
                 return {
                     newSizeUsd: newPosition.sizeUsd,
                     feeUsd: feeUsd,
@@ -3826,6 +3811,121 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.swapAndAddCollateral = function (targetSymbol, inputSymbol, collateralSymbol, amountIn, minCollateralAmountOut, side, positionPubKey, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, collateralCustodyConfig, targetCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, marketAccount, instruction;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
+                            if (!collateralCustodyConfig || !targetCustodyConfig || !inputCustodyConfig) {
+                                throw "payTokenCustody not found";
+                            }
+                            if (inputCustodyConfig.mintKey.equals(collateralCustodyConfig.mintKey)) {
+                                throw "Use Simple Swap";
+                            }
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            if (!(inputSymbol == 'SOL')) return [3, 3];
+                            console.log("inputSymbol === SOL", inputSymbol);
+                            lamports = amountIn.add(new anchor_1.BN(this.minimumBalanceForRentExemptAccountLamports));
+                            console.log("lamports:", lamports.toNumber());
+                            if (!!skipBalanceChecks) return [3, 2];
+                            _a = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getBalance(publicKey)];
+                        case 1:
+                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _c.sent()]))();
+                            if (unWrappedSolBalance.lt(lamports)) {
+                                throw "Insufficient SOL Funds";
+                            }
+                            _c.label = 2;
+                        case 2:
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
+                                additionalSigners.push(wrappedSolAccount);
+                            }
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports.toNumber(),
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
+                            ];
+                            return [3, 6];
+                        case 3:
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true);
+                            if (!!skipBalanceChecks) return [3, 6];
+                            return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
+                        case 4:
+                            if (!(_c.sent())) {
+                                throw "Insufficient Funds , token Account doesn't exist";
+                            }
+                            _b = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
+                        case 5:
+                            tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_c.sent()).value.amount]))();
+                            if (tokenAccountBalance.lt(amountIn)) {
+                                throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
+                            }
+                            _c.label = 6;
+                        case 6:
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey, true);
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 7:
+                            if (!(_c.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralCustodyConfig.mintKey));
+                            }
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            return [4, this.program.methods.swapAndAddCollateral({
+                                    amountIn: amountIn,
+                                    minCollateralAmountOut: minCollateralAmountOut,
+                                }).accounts({
+                                    owner: publicKey,
+                                    feePayer: publicKey,
+                                    fundingAccount: inputSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userInputTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    receivingCustody: inputCustodyConfig.custodyAccount,
+                                    receivingCustodyOracleAccount: this.useExtOracleAccount ? inputCustodyConfig.extOracleAccount : inputCustodyConfig.intOracleAccount,
+                                    receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
+                                    position: positionPubKey,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .instruction()];
+                        case 8:
+                            instruction = _c.sent();
+                            instructions.push(instruction);
+                            return [2, {
+                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                    additionalSigners: additionalSigners
+                                }];
+                    }
+                });
+            });
+        };
         this.removeCollateral = function (collateralWithFee, marketSymbol, collateralSymbol, side, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA, ephemeralSignerPubkey) {
             if (createUserATA === void 0) { createUserATA = true; }
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
@@ -4048,6 +4148,102 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.removeCollateralAndSwap = function (targetSymbol, collateralSymbol, outputSymbol, minSwapAmountOut, collateralDelta, side, poolConfig, ephemeralSignerPubkey) {
+            if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, targetCustodyConfig, collateralCustodyConfig, outputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userReceivingTokenAccount, lamports, userCollateralTokenAccount, marketAccount, positionAccount, instruction;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            outputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(outputSymbol).mintKey); });
+                            if (outputCustodyConfig.mintKey.equals(collateralCustodyConfig.mintKey)) {
+                                throw "Dont use swap, just call remove collateral";
+                            }
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            if (!(outputSymbol == 'SOL')) return [3, 1];
+                            console.log("outputSymbol === SOL", outputSymbol);
+                            lamports = this.minimumBalanceForRentExemptAccountLamports;
+                            if (!ephemeralSignerPubkey) {
+                                wrappedSolAccount = new web3_js_1.Keypair();
+                                additionalSigners.push(wrappedSolAccount);
+                            }
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey),
+                                    lamports: lamports,
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)((ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey), publicKey, publicKey),
+                            ];
+                            return [3, 3];
+                        case 1:
+                            userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(outputSymbol).mintKey, publicKey, true);
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 2:
+                            if (!(_a.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(outputSymbol).mintKey));
+                            }
+                            _a.label = 3;
+                        case 3:
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey, true);
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 4:
+                            if (!(_a.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                            }
+                            marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
+                            positionAccount = poolConfig.getPositionFromMarketPk(publicKey, marketAccount);
+                            return [4, this.program.methods
+                                    .removeCollateralAndSwap({
+                                    collateralDelta: collateralDelta,
+                                    minSwapAmountOut: minSwapAmountOut,
+                                })
+                                    .accounts({
+                                    owner: publicKey,
+                                    feePayer: publicKey,
+                                    receivingAccount: outputSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
+                                    collateralAccount: userCollateralTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionAccount,
+                                    market: marketAccount,
+                                    targetCustody: targetCustodyConfig.custodyAccount,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    dispensingCustody: outputCustodyConfig.custodyAccount,
+                                    dispensingOracleAccount: this.useExtOracleAccount ? outputCustodyConfig.extOracleAccount : outputCustodyConfig.intOracleAccount,
+                                    dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .instruction()];
+                        case 5:
+                            instruction = _a.sent();
+                            instructions.push(instruction);
+                            return [2, {
+                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                    additionalSigners: additionalSigners
+                                }];
+                    }
+                });
+            });
+        };
         this.increaseSize = function (targetSymbol, collateralSymbol, positionPubKey, side, poolConfig, priceWithSlippage, sizeDelta, privilege, nftTradingAccount, nftReferralAccount, nftRebateTokenAccount) {
             if (nftTradingAccount === void 0) { nftTradingAccount = web3_js_1.PublicKey.default; }
             if (nftReferralAccount === void 0) { nftReferralAccount = web3_js_1.PublicKey.default; }

package/dist/PoolConfig.json

@@ -1472,123 +1472,6 @@
                 }
             ]
         },
-        {
-            "programId": "FLASH6Lo6h3iasJKWDs2F8TkW2UKf3s15C8PMGuVfgBn",
-            "perpComposibilityProgramId": "FSWAPViR8ny5K96hezav8jynVubP2dJ2L7SbKzds2hwm",
-            "fbNftRewardProgramId": "FBRWDXSLysNbFQk64MQJcpkXP8e4fjezsGabV8jV7d7o",
-            "cluster": "mainnet-beta",
-            "poolName": "Test.1",
-            "poolAddress": "8isRqdPXU5DLhitggkw6xfyPu78W83JJ5TZYfpE36Beg",
-            "stakedLpTokenMint": "G79ZLZPd1wjK8dJAmGPti9D34XXo8RemnhgETFityz5",
-            "compoundingTokenMint": "8arwA4hCG4Jgs7WSqoV9mv7EGuSDoxQeVZ7zLt1kPCW2",
-            "stakedLpVault": "HaMspzihCtjULo7Jj2RksFDbnjU3YfoLg5biF1WCfiLM",
-            "compoundingLpVault": "EcMpHGK3xQJgDDUxnicHJDAUq812bLxWtD3KH2NCrieQ",
-            "metadataAccount": "F5c5aokEimuxvFUU7RwzjB2g9g95wgUqMtFdRdyti1oi",
-            "lpDecimals": 6,
-            "compoundingLpTokenSymbol": "FLP.7",
-            "stakedLpTokenSymbol": "sFLP.7",
-            "perpetuals": "7DWCtB5Z8rPiyBMKUwqyC95R9tJpbhoQhLM9LbK3Z5QZ",
-            "transferAuthority": "81xGAvJ27ZeRThU2JEfKAUeT4Fx6qCCd8WHZpujZbiiG",
-            "multisig": "3FqKnAQrvr6G6AqCAWKdqg9fVe6ceAk3A5Y1ibeQqV2V",
-            "addressLookupTableAddresses": [
-                "AUebVLw8UwN35Us2XcPQaTQejJoQ5T7ckWzxHTwN1mkM"
-            ],
-            "backupOracle": "AjAubETeBLhebBxLcErmzbavZfqF9bCxkpRAdyJtoi9G",
-            "nftCollectionAddress": "H4EQ8pcE7PQSQGG1WYW4hAA1nizU6ULYipHZcYk9b64u",
-            "rewardDistributionProgram": {
-                "programId": "FARNT7LL119pmy9vSkN9q1ApZESPaKHuuX5Acz1oBoME",
-                "transferAuthority": "E2GZM2FQmX2uGBcBpLQB3s5UhPJvM2F8BgHEkBG45xBN",
-                "rewardVault": "6sXyDryKp6hqV6E1jc7gbzTeWxTFUW1A6s39vzp55hLL",
-                "rewardMint": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
-                "rewardTokenAccount": "EhH4KEra2UfKdwRErjEFf2286BQ3BstKxfLiyYnF513h"
-            },
-            "tokens": [
-                {
-                    "symbol": "USDC",
-                    "mintKey": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
-                    "decimals": 6,
-                    "usdPrecision": 2,
-                    "tokenPrecision": 4,
-                    "isStable": true,
-                    "isVirtual": false,
-                    "pythTicker": "Crypto.USDC/USD",
-                    "pythPriceId": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a"
-                },
-                {
-                    "symbol": "TNSR",
-                    "mintKey": "TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6",
-                    "decimals": 9,
-                    "usdPrecision": 4,
-                    "tokenPrecision": 4,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "pythTicker": "Crypto.TNSR/USD",
-                    "pythPriceId": "05ecd4597cd48fe13d6cc3596c62af4f9675aee06e2e0b94c06d8bee2b659e05"
-                }
-            ],
-            "custodies": [
-                {
-                    "custodyId": 0,
-                    "custodyAccount": "8K7KATrT8wv23BDToiJo6Vw2BAnuWCRpsdPszTQcQVWG",
-                    "tokenAccount": "GoBRUmxBeeJhi62qc3GJSJp6eHZJS2N2muqdC427z3Lg",
-                    "symbol": "USDC",
-                    "mintKey": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
-                    "decimals": 6,
-                    "usdPrecision": 2,
-                    "tokenPrecision": 2,
-                    "isStable": true,
-                    "isVirtual": false,
-                    "intOracleAddress": "GCtJxWQ57B3BJUYdWrhb3TUxzeiDUx275ZCxKkTV6G3N",
-                    "extOracleAddress": "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX",
-                    "pythTicker": "Crypto.USDC/USD",
-                    "pythPriceId": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a"
-                },
-                {
-                    "custodyId": 1,
-                    "custodyAccount": "FH2PJoGUWX8FrdPZRFL6X1uu39HNCNiototRYzKoSGvT",
-                    "tokenAccount": "3bzDGCaqaNgH9JDECPd5DbdBkgrBT8pPpitqV1GurGsd",
-                    "symbol": "TNSR",
-                    "mintKey": "TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6",
-                    "decimals": 9,
-                    "usdPrecision": 4,
-                    "tokenPrecision": 4,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "intOracleAddress": "AH1f6CwHweibN4qybx7eu7AS1jUD2WtAG4ZXkndZKMyg",
-                    "extOracleAddress": "9TSGDwcPQX4JpAvZbu2Wp5b68wSYkQvHCvfeBjYcCyC",
-                    "pythTicker": "Crypto.TNSR/USD",
-                    "pythPriceId": "05ecd4597cd48fe13d6cc3596c62af4f9675aee06e2e0b94c06d8bee2b659e05"
-                }
-            ],
-            "markets": [
-                {
-                    "marketId": 0,
-                    "marketAccount": "FBcbz7KLBf316xtgBsFCQ4nfa7J3Es6QXAzYdeBJJYgz",
-                    "pool": "8isRqdPXU5DLhitggkw6xfyPu78W83JJ5TZYfpE36Beg",
-                    "targetCustody": "FH2PJoGUWX8FrdPZRFL6X1uu39HNCNiototRYzKoSGvT",
-                    "collateralCustody": "FH2PJoGUWX8FrdPZRFL6X1uu39HNCNiototRYzKoSGvT",
-                    "side": "long",
-                    "maxLev": 10,
-                    "targetCustodyId": 1,
-                    "collateralCustodyId": 1,
-                    "targetMint": "TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6",
-                    "collateralMint": "TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6"
-                },
-                {
-                    "marketId": 1,
-                    "marketAccount": "AsohBEPcsY6tyUnZWiyFDAMPZgRkboD61ZjTKnCuxXBc",
-                    "pool": "8isRqdPXU5DLhitggkw6xfyPu78W83JJ5TZYfpE36Beg",
-                    "targetCustody": "FH2PJoGUWX8FrdPZRFL6X1uu39HNCNiototRYzKoSGvT",
-                    "collateralCustody": "8K7KATrT8wv23BDToiJo6Vw2BAnuWCRpsdPszTQcQVWG",
-                    "side": "short",
-                    "maxLev": 10,
-                    "targetCustodyId": 1,
-                    "collateralCustodyId": 0,
-                    "targetMint": "TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6",
-                    "collateralMint": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
-                }
-            ]
-        },
         {
             "programId": "FLASH6Lo6h3iasJKWDs2F8TkW2UKf3s15C8PMGuVfgBn",
             "perpComposibilityProgramId": "FSWAPViR8ny5K96hezav8jynVubP2dJ2L7SbKzds2hwm",
@@ -1791,17 +1674,6 @@
                     "isVirtual": false,
                     "pythTicker": "Crypto.ETH/USD",
                     "pythPriceId": "0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace"
-                },
-                {
-                    "symbol": "JitoSOL",
-                    "mintKey": "jtoSPya9XS5ESevDF1wTVsaJTGXG2Zi7PoNhZuNsaEg",
-                    "decimals": 9,
-                    "usdPrecision": 2,
-                    "tokenPrecision": 4,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "pythTicker": "Crypto.JITOSOL/USD",
-                    "pythPriceId": "67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb"
                 }
             ],
             "custodies": [
@@ -1868,22 +1740,6 @@
                     "extOracleAddress": "42amVS4KgzR9rA28tkVYqVXjq9Qa8dcZQMbH5EYFX6XC",
                     "pythTicker": "Crypto.ETH/USD",
                     "pythPriceId": "0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace"
-                },
-                {
-                    "custodyId": 4,
-                    "custodyAccount": "ATbBmmYoe8boViFtxYV2QLkX6b194sHMG54gFu9pNCWa",
-                    "tokenAccount": "FuDjFggDYszQgBb2CT4iwy5XKcqPRfcAs6qmNNjC8Uxd",
-                    "symbol": "JitoSOL",
-                    "mintKey": "jtoSPya9XS5ESevDF1wTVsaJTGXG2Zi7PoNhZuNsaEg",
-                    "decimals": 9,
-                    "usdPrecision": 2,
-                    "tokenPrecision": 4,
-                    "isStable": false,
-                    "isVirtual": false,
-                    "intOracleAddress": "CvoTpWoqprBrzApWq5PQyxaj3neyYEMchSm1AVi43FrD",
-                    "extOracleAddress": "AxaxyeDT8JnWERSaTKvFXvPKkEdxnamKSqpWbsSjYg1g",
-                    "pythTicker": "Crypto.JITOSOL/USD",
-                    "pythPriceId": "67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb"
                 }
             ],
             "markets": [
@@ -1964,19 +1820,6 @@
                     "collateralCustodyId": 0,
                     "targetMint": "BA17bkYW78GvnirtgRHcceQxZdwkhpzbvrwDU6voUXRz",
                     "collateralMint": "Gh9ZwEmdLJ8DscKNTkTqPbNwLNNBjuSzaG9Vp2KGtKJr"
-                },
-                {
-                    "marketId": 6,
-                    "marketAccount": "BWhe2aFnpcmtLKVPWCgxeUuyKCUFKVMicnXVYK8iYyEz",
-                    "pool": "7jA4ZSGwaBxXk5EmPKDCSc5RtZNHxyoxy22iQt3D2mH9",
-                    "targetCustody": "8BHHyTJKvZXQkjCeigdkH7hAFcnfX5ecXwysjLnG18FT",
-                    "collateralCustody": "ATbBmmYoe8boViFtxYV2QLkX6b194sHMG54gFu9pNCWa",
-                    "side": "long",
-                    "maxLev": 100,
-                    "targetCustodyId": 1,
-                    "collateralCustodyId": 4,
-                    "targetMint": "So11111111111111111111111111111111111111112",
-                    "collateralMint": "jtoSPya9XS5ESevDF1wTVsaJTGXG2Zi7PoNhZuNsaEg"
                 }
             ]
         },