flash-sdk 1.0.108 → 1.0.109

package/dist/PerpetualsClient.d.ts

@@ -7,6 +7,7 @@ import { AddLiquidityAmountAndFee, AumCalcMode, BorrowRateParams, EntryPriceAndF
 import { OraclePrice } from "./OraclePrice";
 import { CustodyAccount } from "./CustodyAccount";
 import { Perpetuals } from "./idl/perpetuals";
+import { PerpComposability } from "./idl/perp_composability";
 import { SendTransactionOpts } from "./utils/rpc";
 import { PoolConfig, Token } from "./PoolConfig";
 import { max } from "bn.js";
@@ -20,8 +21,10 @@ export type PerpClientOptions = {
 export declare class PerpetualsClient {
     provider: AnchorProvider;
     program: Program<Perpetuals>;
+    programPerpComposability: Program<PerpComposability>;
     admin: PublicKey;
     programId: PublicKey;
+    composabilityProgramId: PublicKey;
     multisig: {
         publicKey: PublicKey;
         bump: number;
@@ -42,7 +45,7 @@ export declare class PerpetualsClient {
     private postSendTxCallback?;
     private prioritizationFee;
     private txConfirmationCommitment;
-    constructor(provider: AnchorProvider, programId: 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) => {
@@ -2198,12 +2201,15 @@ export declare class PerpetualsClient {
     checkIfPriceStaleOrCustom: (price: OraclePrice, emaPrice: OraclePrice, custodyAccount: CustodyAccount, timestampInSeconds: BN) => boolean;
     getAveragePriceSync: (price1: BN, size1: BN, price2: BN, size2: BN) => BN;
     getLeverageSync: (sizeUsd: BN, collateralAmount: BN, collateralMinOraclePrice: OraclePrice, collateralTokenDecimals: number, pnlUsd: BN) => BN;
+    getLeverageAtAmountEntryWithSwapSync: (positionAccount: PositionAccount | null, collateralDeltaAmount: BN, sizeDeltaAmount: BN, sizeUsd: BN, inputAmount: BN, 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;
     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;
+    getSizeAmountWithSwapSync: (amountIn: BN, leverage: string, 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) => BN;
     getCollateralAmountWithFeeFromLeverageAndSize: (sizeAmount: BN, leverage: string, marketToken: Token, collateralToken: Token, side: Side, marketPrice: OraclePrice, marketEmaPrice: OraclePrice, marketCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount) => BN;
+    getCollateralAmountWithSwapSync: (sizeAmount: BN, leverage: string, 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) => BN;
     getDecreaseSizeCollateralAndFeeSync: (positionAccount: PositionAccount, sizeDeltaUsd: BN, keepLevSame: boolean, marketPrice: OraclePrice, marketEmaPrice: OraclePrice, marketCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN) => RemoveCollateralData;
     getFinalCloseAmountSync: (positionAccount: PositionAccount, marketPrice: OraclePrice, marketEmaPrice: OraclePrice, marketCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN) => {
         finalAmount: BN;
@@ -2232,6 +2238,10 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    openPositionWithSwap: (marketSymbol: string, inputSymbol: string, collateralSymbol: string, amountIn: BN, minAmountOut: BN, priceAfterSlippage: BN, size: BN, side: Side, poolConfig: PoolConfig, skipBalanceChecks?: boolean) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
     closePosition: (marketSymbol: string, collateralSymbol: string, priceAfterSlippage: BN, side: Side, poolConfig: PoolConfig, createUserATA?: boolean, closeUsersWSOLATA?: boolean) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
@@ -2244,6 +2254,10 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    addCollateralWithSwap: (marketSymbol: string, inputSymbol: string, collateralSymbol: string, amountIn: BN, minAmountOut: BN, positionPubKey: PublicKey, poolConfig: PoolConfig, skipBalanceChecks?: boolean) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
     removeCollateral: (collateralWithFee: BN, marketSymbol: string, collateralSymbol: string, positionPubKey: PublicKey, poolConfig: PoolConfig, createUserATA?: boolean, closeUsersWSOLATA?: boolean) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];

package/dist/PerpetualsClient.js

@@ -69,12 +69,13 @@ var PositionAccount_1 = require("./PositionAccount");
 var types_1 = require("./types");
 var OraclePrice_1 = require("./OraclePrice");
 var perpetuals_1 = require("./idl/perpetuals");
+var perp_composability_1 = require("./idl/perp_composability");
 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 PerpetualsClient = (function () {
-    function PerpetualsClient(provider, programId, opts) {
+    function PerpetualsClient(provider, programId, composabilityProgramId, opts) {
         var _this = this;
         var _a;
         this.addressLookupTables = [];
@@ -1139,6 +1140,27 @@ var PerpetualsClient = (function () {
                 return new anchor_1.BN(Number.MAX_SAFE_INTEGER);
             }
         };
+        this.getLeverageAtAmountEntryWithSwapSync = function (positionAccount, collateralDeltaAmount, sizeDeltaAmount, sizeUsd, inputAmount, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount, poolAumUsdMax, poolConfig, pnlUsd) {
+            var finalCollateralAmount;
+            if (inputTokenCustodyAccount.publicKey.equals(collateralTokenCustodyAccount.publicKey)) {
+                finalCollateralAmount = inputAmount;
+                console.log("no swap needed");
+            }
+            else {
+                var swapAmountOut = _this.getSwapAmountAndFeesSync(inputAmount, constants_1.BN_ZERO, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, poolAumUsdMax, poolConfig).minAmountOut;
+                console.log("swapOut", swapAmountOut.toString());
+                finalCollateralAmount = swapAmountOut;
+            }
+            var collateralMinOraclePrice = _this.getMinAndMaxOraclePriceSync(collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount).min;
+            var currentCollateralUsd = collateralMinOraclePrice.getAssetAmountUsd(finalCollateralAmount, collateralTokenCustodyAccount.decimals);
+            var currentCollateralUsdIncludingPnl = currentCollateralUsd.add(pnlUsd);
+            if (currentCollateralUsdIncludingPnl.gt(constants_1.BN_ZERO)) {
+                return sizeUsd.mul(new anchor_1.BN(constants_1.BPS_POWER)).div(currentCollateralUsdIncludingPnl);
+            }
+            else {
+                return new anchor_1.BN(Number.MAX_SAFE_INTEGER);
+            }
+        };
         this.getEntryPriceAndFeeSync = function (positionAccount, collateralDeltaAmount, sizeDeltaAmount, side, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp) {
             if (collateralDeltaAmount.isNeg() || sizeDeltaAmount.isNeg()) {
                 throw new Error("Delta Amounts cannot be negative.");
@@ -1231,6 +1253,29 @@ var PerpetualsClient = (function () {
             var sizeAmountUi = sizeUsdUi.dividedBy(entryPriceUi);
             return (0, utils_1.uiDecimalsToNative)(sizeAmountUi.toFixed(marketToken.decimals, bignumber_js_1.default.ROUND_DOWN), marketToken.decimals);
         };
+        this.getSizeAmountWithSwapSync = function (amountIn, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount, poolAumUsdMax, poolConfig) {
+            var finalCollateralAmount = constants_1.BN_ZERO;
+            if (inputTokenCustodyAccount.publicKey.equals(collateralTokenCustodyAccount.publicKey)) {
+                finalCollateralAmount = amountIn;
+                console.log("no swap needed");
+            }
+            else {
+                var swapAmountOut = _this.getSwapAmountAndFeesSync(amountIn, constants_1.BN_ZERO, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, poolAumUsdMax, poolConfig).minAmountOut;
+                console.log("swapOut", swapAmountOut.toString());
+                finalCollateralAmount = swapAmountOut;
+            }
+            var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount).min;
+            var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
+            var entryPriceBN = _this.getEntryPriceSync(side, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount);
+            var entryPriceUi = new bignumber_js_1.default(entryPriceBN.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
+            var collateralAmtMinUsdUi = new bignumber_js_1.default(finalCollateralAmount.toString()).dividedBy(Math.pow(10, collateralTokenCustodyAccount.decimals))
+                .multipliedBy(collateralTokenMinPriceUi);
+            var openPosFeeRateUi = new bignumber_js_1.default(marketTokenCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
+            var sizeUsdUi = collateralAmtMinUsdUi.multipliedBy(leverage)
+                .dividedBy(new bignumber_js_1.default(1).plus(openPosFeeRateUi.multipliedBy(leverage)));
+            var sizeAmountUi = sizeUsdUi.dividedBy(entryPriceUi);
+            return (0, utils_1.uiDecimalsToNative)(sizeAmountUi.toFixed(marketTokenCustodyAccount.decimals, bignumber_js_1.default.ROUND_DOWN), marketTokenCustodyAccount.decimals);
+        };
         this.getCollateralAmountWithFeeFromLeverageAndSize = function (sizeAmount, leverage, marketToken, collateralToken, side, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount) {
             var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount).min;
             var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
@@ -1243,6 +1288,27 @@ var PerpetualsClient = (function () {
             var collateralAmtWithFeeUi = collateralWithFeeUsdUi.dividedBy(collateralTokenMinPriceUi);
             return (0, utils_1.uiDecimalsToNative)(collateralAmtWithFeeUi.toFixed(collateralToken.decimals, bignumber_js_1.default.ROUND_DOWN), collateralToken.decimals);
         };
+        this.getCollateralAmountWithSwapSync = function (sizeAmount, leverage, side, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount, poolAumUsdMax, poolConfig) {
+            var collateralTokenMinPrice = _this.getMinAndMaxPriceSync(collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount).min;
+            var collateralTokenMinPriceUi = new bignumber_js_1.default(collateralTokenMinPrice.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
+            var entryPriceBN = _this.getEntryPriceSync(side, marketTokenPrice, marketTokenEmaPrice, marketTokenCustodyAccount);
+            var entryPriceUi = new bignumber_js_1.default(entryPriceBN.toString()).dividedBy(Math.pow(10, constants_1.PRICE_DECIMALS));
+            var openPosFeeRateUi = new bignumber_js_1.default(marketTokenCustodyAccount.fees.openPosition.toString()).dividedBy(Math.pow(10, constants_1.RATE_DECIMALS));
+            var sizeAmountUi = new bignumber_js_1.default(sizeAmount.toString()).dividedBy(Math.pow(10, marketTokenCustodyAccount.decimals));
+            var sizeUsdUi = entryPriceUi.multipliedBy(sizeAmountUi);
+            var collateralWithFeeUsdUi = sizeUsdUi.multipliedBy(new bignumber_js_1.default(1).plus(openPosFeeRateUi.multipliedBy(leverage))).dividedBy(leverage);
+            var collateralAmtWithFeeUi = collateralWithFeeUsdUi.dividedBy(collateralTokenMinPriceUi);
+            var collateralAmountWithFee = (0, utils_1.uiDecimalsToNative)(collateralAmtWithFeeUi.toFixed(collateralTokenCustodyAccount.decimals, bignumber_js_1.default.ROUND_DOWN), collateralTokenCustodyAccount.decimals);
+            var collateralInInputToken;
+            if (inputTokenCustodyAccount.publicKey.equals(collateralTokenCustodyAccount.publicKey)) {
+                console.log("no swap needed");
+                collateralInInputToken = collateralAmountWithFee;
+            }
+            else {
+                collateralInInputToken = _this.getSwapAmountAndFeesSync(constants_1.BN_ZERO, collateralAmountWithFee, poolAccount, inputTokenPrice, inputTokenEmaPrice, inputTokenCustodyAccount, collateralTokenPrice, collateralTokenEmaPrice, collateralTokenCustodyAccount, poolAumUsdMax, poolConfig).minAmountIn;
+            }
+            return collateralInInputToken;
+        };
         this.getDecreaseSizeCollateralAndFeeSync = function (positionAccount, sizeDeltaUsd, keepLevSame, marketPrice, marketEmaPrice, marketCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp) {
             if (!marketCustodyAccount.publicKey.equals(positionAccount.custody)) {
                 throw new Error("marketCustodyAccount mismatch");
@@ -1723,6 +1789,151 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.openPositionWithSwap = function (marketSymbol, inputSymbol, collateralSymbol, amountIn, minAmountOut, priceAfterSlippage, size, side, poolConfig, skipBalanceChecks) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, marketCustodyConfig, collateralCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, positionAccount, custodyAccountMetas, custodyOracleAccountMetas, custodyCustomOracles, _i, _c, custody, instruction;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
+                            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);
+                            wrappedSolAccount = new web3_js_1.Keypair();
+                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
+                        case 1:
+                            accCreationLamports = (_d.sent());
+                            console.log("accCreationLamports:", accCreationLamports);
+                            lamports = amountIn.add(new anchor_1.BN(accCreationLamports));
+                            _a = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getBalance(publicKey)];
+                        case 2:
+                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _d.sent()]))();
+                            if (unWrappedSolBalance.lt(lamports)) {
+                                throw "Insufficient SOL Funds";
+                            }
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: wrappedSolAccount.publicKey,
+                                    lamports: lamports.toNumber(),
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)(wrappedSolAccount.publicKey, spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)(wrappedSolAccount.publicKey, publicKey, publicKey),
+                            ];
+                            additionalSigners.push(wrappedSolAccount);
+                            return [3, 6];
+                        case 3:
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(inputSymbol).mintKey, publicKey);
+                            return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
+                        case 4:
+                            if (!(_d.sent())) {
+                                throw "Insufficient Funds , Token Account doesn't exist";
+                            }
+                            if (!!skipBalanceChecks) return [3, 6];
+                            _b = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
+                        case 5:
+                            tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_d.sent()).value.amount]))();
+                            if (tokenAccountBalance.lt(amountIn)) {
+                                throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
+                            }
+                            _d.label = 6;
+                        case 6:
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey);
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 7:
+                            if (!(_d.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
+                            }
+                            positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
+                                Buffer.from("position"),
+                                publicKey.toBuffer(),
+                                poolConfig.poolAddress.toBuffer(),
+                                marketCustodyConfig.custodyAccount.toBuffer(),
+                                (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
+                            ], this.programId)[0];
+                            custodyAccountMetas = [];
+                            custodyOracleAccountMetas = [];
+                            custodyCustomOracles = [];
+                            for (_i = 0, _c = poolConfig.custodies; _i < _c.length; _i++) {
+                                custody = _c[_i];
+                                custodyAccountMetas.push({
+                                    pubkey: custody.custodyAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyOracleAccountMetas.push({
+                                    pubkey: custody.oracleAddress,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyCustomOracles.push({
+                                    pubkey: web3_js_1.SystemProgram.programId,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            return [4, this.programPerpComposability.methods
+                                    .swapAndOpen({
+                                    amountIn: amountIn,
+                                    minAmountOut: minAmountOut,
+                                    openPrice: priceAfterSlippage,
+                                    openSize: size,
+                                    side: side,
+                                })
+                                    .accounts({
+                                    delegate: publicKey,
+                                    owner: publicKey,
+                                    fundingAccount: inputSymbol == 'SOL' ? wrappedSolAccount.publicKey : userInputTokenAccount,
+                                    receivingAccount: userCollateralTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    receivingCustody: inputCustodyConfig.custodyAccount,
+                                    receivingCustodyOracleAccount: inputCustodyConfig.oracleAddress,
+                                    receivingCustodyCustomOracleAccount: web3_js_1.SystemProgram.programId,
+                                    receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
+                                    dispensingCustody: collateralCustodyConfig.custodyAccount,
+                                    dispensingCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
+                                    dispensingCustodyCustomOracleAccount: web3_js_1.SystemProgram.programId,
+                                    dispensingCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    position: positionAccount,
+                                    custody: marketCustodyConfig.custodyAccount,
+                                    custodyOracleAccount: marketCustodyConfig.oracleAddress,
+                                    custodyCustomOracleAccount: web3_js_1.SystemProgram.programId,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    systemProgram: web3_js_1.SystemProgram.programId,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    perpProgram: this.programId,
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), custodyCustomOracles, true))
+                                    .instruction()];
+                        case 8:
+                            instruction = _d.sent();
+                            instructions.push(instruction);
+                            return [2, {
+                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                    additionalSigners: additionalSigners
+                                }];
+                    }
+                });
+            });
+        };
         this.closePosition = function (marketSymbol, collateralSymbol, priceAfterSlippage, side, poolConfig, createUserATA, closeUsersWSOLATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
@@ -2142,6 +2353,142 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.addCollateralWithSwap = function (marketSymbol, inputSymbol, collateralSymbol, amountIn, minAmountOut, positionPubKey, poolConfig, skipBalanceChecks) {
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, collateralCustodyConfig, marketCustodyConfig, inputCustodyConfig, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, userCollateralTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, custodyCustomOracles, _i, _c, custody, instruction;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            publicKey = this.provider.wallet.publicKey;
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
+                            inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
+                            if (!collateralCustodyConfig || !marketCustodyConfig || !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);
+                            wrappedSolAccount = new web3_js_1.Keypair();
+                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
+                        case 1:
+                            accCreationLamports = (_d.sent());
+                            console.log("accCreationLamports:", accCreationLamports);
+                            lamports = amountIn.add(new anchor_1.BN(accCreationLamports));
+                            console.log("lamports:", lamports.toNumber());
+                            _a = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getBalance(publicKey)];
+                        case 2:
+                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _d.sent()]))();
+                            if (unWrappedSolBalance.lt(lamports)) {
+                                throw "Insufficient SOL Funds";
+                            }
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: wrappedSolAccount.publicKey,
+                                    lamports: lamports.toNumber(),
+                                    space: 165,
+                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
+                                }),
+                                (0, spl_token_1.createInitializeAccount3Instruction)(wrappedSolAccount.publicKey, spl_token_1.NATIVE_MINT, publicKey),
+                            ];
+                            postInstructions = [
+                                (0, spl_token_1.createCloseAccountInstruction)(wrappedSolAccount.publicKey, publicKey, publicKey),
+                            ];
+                            additionalSigners.push(wrappedSolAccount);
+                            return [3, 6];
+                        case 3:
+                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey);
+                            return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
+                        case 4:
+                            if (!(_d.sent())) {
+                                throw "Insufficient Funds , token Account doesn't exist";
+                            }
+                            if (!!skipBalanceChecks) return [3, 6];
+                            _b = anchor_1.BN.bind;
+                            return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
+                        case 5:
+                            tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_d.sent()).value.amount]))();
+                            if (tokenAccountBalance.lt(amountIn)) {
+                                throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
+                            }
+                            _d.label = 6;
+                        case 6:
+                            userCollateralTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey);
+                            return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
+                        case 7:
+                            if (!(_d.sent())) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userCollateralTokenAccount, publicKey, collateralCustodyConfig.mintKey));
+                            }
+                            custodyAccountMetas = [];
+                            custodyOracleAccountMetas = [];
+                            custodyCustomOracles = [];
+                            for (_i = 0, _c = poolConfig.custodies; _i < _c.length; _i++) {
+                                custody = _c[_i];
+                                custodyAccountMetas.push({
+                                    pubkey: custody.custodyAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyOracleAccountMetas.push({
+                                    pubkey: custody.oracleAddress,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyCustomOracles.push({
+                                    pubkey: web3_js_1.SystemProgram.programId,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            return [4, this.programPerpComposability.methods.swapAndAddCollateral({
+                                    amountIn: amountIn,
+                                    minAmountOut: minAmountOut,
+                                }).accounts({
+                                    delegate: publicKey,
+                                    owner: publicKey,
+                                    position: positionPubKey,
+                                    fundingAccount: inputSymbol == 'SOL' ? wrappedSolAccount.publicKey : userInputTokenAccount,
+                                    receivingAccount: userCollateralTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    receivingCustody: inputCustodyConfig.custodyAccount,
+                                    receivingCustodyOracleAccount: inputCustodyConfig.oracleAddress,
+                                    receivingCustodyCustomOracleAccount: web3_js_1.SystemProgram.programId,
+                                    receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
+                                    dispensingCustody: collateralCustodyConfig.custodyAccount,
+                                    dispensingCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
+                                    dispensingCustodyCustomOracleAccount: web3_js_1.SystemProgram.programId,
+                                    dispensingCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    custody: marketCustodyConfig.custodyAccount,
+                                    custodyOracleAccount: marketCustodyConfig.oracleAddress,
+                                    custodyCustomOracleAccount: web3_js_1.SystemProgram.programId,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    perpProgram: this.programId,
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), custodyCustomOracles, true))
+                                    .instruction()];
+                        case 8:
+                            instruction = _d.sent();
+                            instructions.push(instruction);
+                            return [2, {
+                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                    additionalSigners: additionalSigners
+                                }];
+                    }
+                });
+            });
+        };
         this.removeCollateral = function (collateralWithFee, marketSymbol, collateralSymbol, positionPubKey, poolConfig, createUserATA, closeUsersWSOLATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
@@ -2619,7 +2966,9 @@ var PerpetualsClient = (function () {
         this.provider = provider;
         (0, anchor_1.setProvider)(provider);
         this.program = new anchor_1.Program(perpetuals_1.IDL, programId);
+        this.programPerpComposability = new anchor_1.Program(perp_composability_1.IDL, composabilityProgramId);
         this.programId = programId;
+        this.composabilityProgramId = composabilityProgramId;
         this.admin = this.provider.wallet.publicKey;
         this.multisig = this.findProgramAddress("multisig");
         this.authority = this.findProgramAddress("transfer_authority");