flash-sdk 1.0.14 → 1.0.16

package/lib/PerpetualsClient.d.ts

@@ -1,5 +1,5 @@
 import { Program, AnchorProvider, BN } from "@coral-xyz/anchor";
-import { PublicKey, TransactionInstruction, Commitment } from "@solana/web3.js";
+import { PublicKey, TransactionInstruction, Commitment, Signer } from "@solana/web3.js";
 import { PoolAccount } from "./PoolAccount";
 import { AumCalcMode, BorrowRateParams, Fees, OracleParams, Permissions, Position, PositionSide, PricingParams, Side, TokenRatios } from "./types";
 import { OraclePrice } from "./OraclePrice";
@@ -1949,8 +1949,14 @@ export declare class PerpetualsClient {
     getAumView: (poolName: string) => Promise<any>;
     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[]>;
+    openPosition: (payTokenSymbol: string, priceAfterSlippage: BN, collateralWithfee: BN, fee: BN, size: BN, side: Side, poolConfig: PoolConfig, createUserWSOLATA?: boolean, skipBalanceChecks?: boolean) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    closePosition: (receivingTokenSymbol: string, priceAfterSlippage: BN, side: Side, poolConfig: PoolConfig, createUserATA?: boolean, closeUsersWSOLATA?: boolean) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
     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

@@ -1036,91 +1036,110 @@ 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
-        this.openPosition = function (payTokenSymbol, priceAfterSlippage, collateral, fee, size, side, poolConfig, createUserWSOLATA // if false will also skip balance checks 
-        ) {
+        // Create WSOL Token account and not ATA and close it in end 
+        // TODO:  close other Accounts - NOT NEEDED
+        this.openPosition = function (payTokenSymbol, priceAfterSlippage, collateralWithfee, fee, size, side, poolConfig, createUserWSOLATA, skipBalanceChecks) {
             if (createUserWSOLATA === void 0) { createUserWSOLATA = true; }
+            if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, payTokenCustody, userCustodyTokenAccount, instructions, wsolAssociatedTokenAccount, wsolATAExist, collateralWithfee, wsolBalance, _a, _b, unWrappedSolBalance, _c, totalSolBal, conversionAmt, tokenAccountBalance, _d, positionAccount, params, instruction, error_2;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                var publicKey, payTokenCustody, userCustodyTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, tokenAccountBalance, _a, positionAccount, params, instruction, error_2;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             console.log("open position :::", payTokenSymbol, poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey.toBase58());
                             publicKey = this.provider.wallet.publicKey;
                             payTokenCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey); });
                             return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey, publicKey)];
                         case 1:
-                            userCustodyTokenAccount = _e.sent();
+                            userCustodyTokenAccount = _b.sent();
+                            preInstructions = [];
                             instructions = [];
-                            _e.label = 2;
+                            postInstructions = [];
+                            additionalSigners = [];
+                            _b.label = 2;
                         case 2:
-                            _e.trys.push([2, 15, , 16]);
-                            if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3 /*break*/, 9];
+                            _b.trys.push([2, 10, , 11]);
+                            if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3 /*break*/, 4];
                             console.log("payTokenSymbol === sol", payTokenSymbol);
-                            wsolAssociatedTokenAccount = userCustodyTokenAccount;
-                            return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
+                            // const wsolAssociatedTokenAccount = userCustodyTokenAccount;
+                            // const wsolATAExist = await checkIfAccountExists(wsolAssociatedTokenAccount, this.provider.connection)
+                            // if (!wsolATAExist) {
+                            //   console.log("wsol ata does not exist");
+                            //   instructions.push(
+                            //     createAssociatedTokenAccountInstruction(
+                            //       publicKey,
+                            //       wsolAssociatedTokenAccount,
+                            //       publicKey,
+                            //       NATIVE_MINT
+                            //     )
+                            //   );
+                            // }
+                            // // get balance of WSOL associated token account
+                            // const wsolBalance = new BN(wsolATAExist ? (await this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)).value.amount : 0);
+                            // if (wsolBalance.lt(collateralWithfee)) {
+                            //   console.log("WSOL balance insufficient \n so Convert SOL to WSOL"); 
+                            //   let unWrappedSolBalance = new BN(await this.provider.connection.getBalance(publicKey));
+                            //   const totalSolBal = unWrappedSolBalance.add(wsolBalance);
+                            //   // const rentExemptSolNeedforATA = new BN(0.02 * LAMPORTS_PER_SOL);
+                            //   // console.log("rentExemptSolNeedforATA:",rentExemptSolNeedforATA.toString())
+                            //   //TODOD ::  add(rentExemptSolNeedforATA)
+                            //   if (totalSolBal.lt(collateralWithfee)) {
+                            //     throw "Insufficient SOL Funds"
+                            //   } else {
+                            //     console.log("SOL balance sufficient so transfer from SOL to WSOL ATA")
+                            //   }
+                            //   let conversionAmt = collateralWithfee.sub(wsolBalance);
+                            //   console.log("conversionAmt:",conversionAmt.toString())
+                            //   instructions.push(
+                            //     SystemProgram.transfer({
+                            //       fromPubkey: publicKey,
+                            //       toPubkey: wsolAssociatedTokenAccount,
+                            //       lamports: conversionAmt.toNumber(), // IS IT SAFE TO PUT AS NUMBER
+                            //     }),
+                            //     createSyncNativeInstruction(wsolAssociatedTokenAccount)
+                            //   );
+                            // }
+                            wrappedSolAccount = new web3_js_1.Keypair();
+                            return [4 /*yield*/, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
                         case 3:
-                            wsolATAExist = _e.sent();
-                            if (!wsolATAExist) {
-                                console.log("wsol ata does not exist");
-                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
-                            }
-                            collateralWithfee = collateral.add(fee);
-                            _a = anchor_1.BN.bind;
-                            if (!wsolATAExist) return [3 /*break*/, 5];
-                            return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
+                            accCreationLamports = (_b.sent());
+                            console.log("accCreationLamports:", accCreationLamports);
+                            lamports = collateralWithfee.add(new anchor_1.BN(accCreationLamports));
+                            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 /*break*/, 8];
                         case 4:
-                            _b = (_e.sent()).value.amount;
-                            return [3 /*break*/, 6];
-                        case 5:
-                            _b = 0;
-                            _e.label = 6;
-                        case 6:
-                            wsolBalance = new (_a.apply(anchor_1.BN, [void 0, _b]))();
-                            if (!wsolBalance.lt(collateralWithfee)) return [3 /*break*/, 8];
-                            console.log("WSOL balance insufficient \n so Convert SOL to WSOL");
-                            _c = anchor_1.BN.bind;
-                            return [4 /*yield*/, this.provider.connection.getBalance(publicKey)];
-                        case 7:
-                            unWrappedSolBalance = new (_c.apply(anchor_1.BN, [void 0, _e.sent()]))();
-                            totalSolBal = unWrappedSolBalance.add(wsolBalance);
-                            // const rentExemptSolNeedforATA = new BN(0.02 * LAMPORTS_PER_SOL);
-                            // console.log("rentExemptSolNeedforATA:",rentExemptSolNeedforATA.toString())
-                            //TODOD ::  add(rentExemptSolNeedforATA)
-                            if (totalSolBal.lt(collateralWithfee)) {
-                                throw "Insufficient SOL Funds";
-                            }
-                            else {
-                                console.log("SOL balance sufficient so transfer from SOL to WSOL ATA");
-                            }
-                            conversionAmt = collateralWithfee.sub(wsolBalance);
-                            console.log("conversionAmt:", conversionAmt.toString());
-                            instructions.push(web3_js_1.SystemProgram.transfer({
-                                fromPubkey: publicKey,
-                                toPubkey: wsolAssociatedTokenAccount,
-                                lamports: conversionAmt.toNumber(), // IS IT SAFE TO PUT AS NUMBER
-                            }), (0, spl_token_1.createSyncNativeInstruction)(wsolAssociatedTokenAccount));
-                            _e.label = 8;
-                        case 8: return [3 /*break*/, 13];
-                        case 9:
-                            if (!(createUserWSOLATA == false)) return [3 /*break*/, 10];
+                            if (!(createUserWSOLATA == false)) return [3 /*break*/, 5];
                             console.log("skip WSOL checks and creation ,since createUserWSOLATA == false");
-                            return [3 /*break*/, 13];
-                        case 10: return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userCustodyTokenAccount, this.provider.connection)];
-                        case 11:
+                            return [3 /*break*/, 8];
+                        case 5: return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userCustodyTokenAccount, this.provider.connection)];
+                        case 6:
                             // for other tokens check if ATA and balance 
-                            if (!(_e.sent())) {
+                            if (!(_b.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
-                            _d = anchor_1.BN.bind;
+                            if (!!skipBalanceChecks) return [3 /*break*/, 8];
+                            _a = anchor_1.BN.bind;
                             return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(userCustodyTokenAccount)];
-                        case 12:
-                            tokenAccountBalance = new (_d.apply(anchor_1.BN, [void 0, (_e.sent()).value.amount]))();
-                            if (tokenAccountBalance.lt(collateral.add(fee))) {
-                                throw "Insufficient Funds";
+                        case 7:
+                            tokenAccountBalance = new (_a.apply(anchor_1.BN, [void 0, (_b.sent()).value.amount]))();
+                            if (tokenAccountBalance.lt(collateralWithfee)) {
+                                throw "Insufficient Funds need more ".concat(collateralWithfee.sub(tokenAccountBalance), " tokens");
                             }
-                            _e.label = 13;
-                        case 13:
+                            _b.label = 8;
+                        case 8:
                             positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
                                 Buffer.from("position"),
                                 publicKey.toBuffer(),
@@ -1130,7 +1149,7 @@ var PerpetualsClient = /** @class */ (function () {
                             ], this.programId)[0];
                             params = {
                                 price: priceAfterSlippage,
-                                collateral: collateral,
+                                collateral: collateralWithfee,
                                 size: size,
                                 side: side,
                             };
@@ -1138,7 +1157,7 @@ var PerpetualsClient = /** @class */ (function () {
                                     .openPosition(params)
                                     .accounts({
                                     owner: publicKey,
-                                    fundingAccount: userCustodyTokenAccount,
+                                    fundingAccount: payTokenSymbol == 'SOL' ? wrappedSolAccount.publicKey : userCustodyTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
@@ -1149,15 +1168,18 @@ var PerpetualsClient = /** @class */ (function () {
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 }).instruction()];
-                        case 14:
-                            instruction = _e.sent();
+                        case 9:
+                            instruction = _b.sent();
                             instructions.push(instruction);
-                            return [3 /*break*/, 16];
-                        case 15:
-                            error_2 = _e.sent();
+                            return [3 /*break*/, 11];
+                        case 10:
+                            error_2 = _b.sent();
                             console.log("perpClient openPosition error:", error_2);
-                            return [3 /*break*/, 16];
-                        case 16: return [2 /*return*/, instructions];
+                            return [3 /*break*/, 11];
+                        case 11: return [2 /*return*/, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
                     }
                 });
             });
@@ -1167,68 +1189,106 @@ 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, createUserATA, closeUsersWSOLATA // to get back WSOL=>SOL
+        ) {
+            if (createUserATA === void 0) { createUserATA = true; }
+            if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, receivingTokenCustody, positionAccount, params, instruction, closeWsolATAIns, error_3;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            console.log("close position :::", receivingTokenSymbol, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey.toBase58());
+                            publicKey = this.provider.wallet.publicKey;
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 9, , 10]);
+                            if (!(receivingTokenSymbol == 'SOL')) return [3 /*break*/, 3];
+                            wrappedSolAccount = new web3_js_1.Keypair();
+                            userReceivingTokenAccount = wrappedSolAccount.publicKey;
+                            return [4 /*yield*/, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
+                        case 2:
+                            lamports = (_b.sent());
+                            preInstructions = [
+                                web3_js_1.SystemProgram.createAccount({
+                                    fromPubkey: publicKey,
+                                    newAccountPubkey: wrappedSolAccount.publicKey,
+                                    lamports: lamports,
+                                    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 /*break*/, 7];
+                        case 3: return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey, publicKey)];
+                        case 4:
+                            userReceivingTokenAccount = _b.sent();
+                            _a = createUserATA;
+                            if (!_a) return [3 /*break*/, 6];
+                            return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        case 5:
+                            _a = !(_b.sent());
+                            _b.label = 6;
+                        case 6:
+                            if (_a) {
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey));
+                            }
+                            _b.label = 7;
+                        case 7:
+                            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 8:
+                            instruction = _b.sent();
+                            instructions.push(instruction);
+                            if (receivingTokenSymbol == 'WSOL' && closeUsersWSOLATA) {
+                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
+                                postInstructions.push(closeWsolATAIns);
+                            }
+                            return [3 /*break*/, 10];
+                        case 9:
+                            error_3 = _b.sent();
+                            console.error("perpclient closePosition error:", error_3);
+                            return [3 /*break*/, 10];
+                        case 10: return [2 /*return*/, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
             });
-        }); };
+        };
         // TODO: ATA check - else create  - DONE 
         // TODO: handle SOL wrapping to WSOL and create a ATA - DONE
         // TODO : Balance checks - NOT NEEDED

package/lib/PoolConfig.json

@@ -31,6 +31,13 @@
                     "isStable": false,
                     "pythTicker": "Crypto.SOL/USD"
                 },
+                {
+                    "symbol": "WSOL",
+                    "mintKey": "So11111111111111111111111111111111111111112",
+                    "decimals": 9,
+                    "isStable": false,
+                    "pythTicker": "Crypto.SOL/USD"
+                },
                 {
                     "symbol": "BTC",
                     "mintKey": "B8DYqbh57aEPRbUq7reyueY6jaYoN75js5YsiM84tFfP",