flash-sdk 1.0.15 → 1.0.17

package/lib/PerpetualsClient.js

@@ -116,7 +116,7 @@ var PerpetualsClient = /** @class */ (function () {
         };
         this.getPool = function (name) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                console.log("pool:", this.getPoolKey(name).toBase58());
+                // console.log("pool:", this.getPoolKey(name).toBase58())
                 return [2 /*return*/, this.program.account.pool.fetch(this.getPoolKey(name))];
             });
         }); };
@@ -163,7 +163,7 @@ var PerpetualsClient = /** @class */ (function () {
         };
         this.getCustody = function (poolName, tokenMint) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                console.log("custody key :", this.getCustodyKey(poolName, tokenMint).toBase58());
+                // console.log("custody key :", this.getCustodyKey(poolName, tokenMint).toBase58());
                 return [2 /*return*/, this.program.account.custody.fetch(this.getCustodyKey(poolName, tokenMint))];
             });
         }); };
@@ -369,7 +369,7 @@ var PerpetualsClient = /** @class */ (function () {
                         err_1 = _a.sent();
                         // @ts-ignore
                         if (this.printErrors) {
-                            console.log(err_1);
+                            console.error("setAdminSigners err:", err_1);
                         }
                         throw err_1;
                     case 4: return [2 /*return*/];
@@ -434,11 +434,7 @@ var PerpetualsClient = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        console.log("CustodyKey", this.getCustodyKey(poolName, tokenMint).toBase58());
-                        console.log("getCustodyTokenAccountKey", this.getCustodyTokenAccountKey(poolName, tokenMint).toBase58());
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        _a.trys.push([0, 2, , 3]);
                         return [4 /*yield*/, this.program.methods
                                 // @ts-ignore
                                 .addCustody({
@@ -469,15 +465,15 @@ var PerpetualsClient = /** @class */ (function () {
                                 console.error(err);
                                 throw err;
                             })];
-                    case 2:
+                    case 1:
                         trx_id = _a.sent();
                         console.log("trx_id:", "https://explorer.solana.com/tx/".concat(trx_id, "?cluster=devnet"));
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 3];
+                    case 2:
                         error_1 = _a.sent();
-                        console.log("cli error :", error_1);
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                        console.error("cli error :", error_1);
+                        return [3 /*break*/, 3];
+                    case 3: return [2 /*return*/];
                 }
             });
         }); };
@@ -485,39 +481,36 @@ var PerpetualsClient = /** @class */ (function () {
             var trx_id;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        console.log("CustodyKey", this.getCustodyKey(poolName, tokenMint).toBase58());
-                        console.log("getCustodyTokenAccountKey", this.getCustodyTokenAccountKey(poolName, tokenMint).toBase58());
-                        return [4 /*yield*/, this.program.methods
-                                //@ts-ignore
-                                .testingEditCustody({
-                                isStable: isStable,
-                                oracle: oracle,
-                                pricing: pricing,
-                                permissions: permissions,
-                                fees: fees,
-                                borrowRate: borrowRate,
-                                ratios: ratios,
-                            })
-                                .accounts({
-                                admin: this.admin,
-                                multisig: this.multisig.publicKey,
-                                transferAuthority: this.authority.publicKey,
-                                perpetuals: this.perpetuals.publicKey,
-                                pool: this.getPoolKey(poolName),
-                                custody: this.getCustodyKey(poolName, tokenMint),
-                                custodyTokenAccount: this.getCustodyTokenAccountKey(poolName, tokenMint),
-                                custodyTokenMint: tokenMint,
-                                systemProgram: web3_js_1.SystemProgram.programId,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                            })
-                                // .signers([this.admin])
-                                .rpc()
-                                .catch(function (err) {
-                                console.error(err);
-                                throw err;
-                            })];
+                    case 0: return [4 /*yield*/, this.program.methods
+                            //@ts-ignore
+                            .testingEditCustody({
+                            isStable: isStable,
+                            oracle: oracle,
+                            pricing: pricing,
+                            permissions: permissions,
+                            fees: fees,
+                            borrowRate: borrowRate,
+                            ratios: ratios,
+                        })
+                            .accounts({
+                            admin: this.admin,
+                            multisig: this.multisig.publicKey,
+                            transferAuthority: this.authority.publicKey,
+                            perpetuals: this.perpetuals.publicKey,
+                            pool: this.getPoolKey(poolName),
+                            custody: this.getCustodyKey(poolName, tokenMint),
+                            custodyTokenAccount: this.getCustodyTokenAccountKey(poolName, tokenMint),
+                            custodyTokenMint: tokenMint,
+                            systemProgram: web3_js_1.SystemProgram.programId,
+                            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                        })
+                            // .signers([this.admin])
+                            .rpc()
+                            .catch(function (err) {
+                            console.error(err);
+                            throw err;
+                        })];
                     case 1:
                         trx_id = _a.sent();
                         console.log("trx_id:", "https://explorer.solana.com/tx/".concat(trx_id, "?cluster=devnet"));
@@ -706,20 +699,12 @@ var PerpetualsClient = /** @class */ (function () {
             });
         }); };
         this.getEntryPriceAndFee = function (poolName, tokenMint, collateral, size, side) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, _b, _c, _d, _e;
-            var _f;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
+            var _a, _b;
+            var _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        console.log("perps: ", this.perpetuals.publicKey.toBase58());
-                        console.log("poolKey: ", this.getPoolKey(poolName).toBase58());
-                        console.log("custody key : ", this.getCustodyKey(poolName, tokenMint).toBase58());
-                        _b = (_a = console).log;
-                        _c = ["orcalve: "];
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1:
-                        _b.apply(_a, _c.concat([(_g.sent()).toBase58()]));
-                        _e = (_d = this.program.methods
+                        _b = (_a = this.program.methods
                             //@ts-ignore
                             .getEntryPriceAndFee({
                             collateral: collateral,
@@ -727,23 +712,27 @@ var PerpetualsClient = /** @class */ (function () {
                             side: side == "long" ? { long: {} } : { short: {} },
                         }))
                             .accounts;
-                        _f = {
+                        _c = {
                             // signer: this.provider.wallet.publicKey,
                             perpetuals: this.perpetuals.publicKey,
                             pool: this.getPoolKey(poolName),
                             custody: this.getCustodyKey(poolName, tokenMint)
                         };
                         return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 2: return [4 /*yield*/, _e.apply(_d, [(_f.custodyOracleAccount = _g.sent(),
-                                _f)])
+                    case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                                _c)])
                             .view()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 3: 
+                    case 2: 
+                    // console.log("perps: ", this.perpetuals.publicKey.toBase58())
+                    // console.log("poolKey: ", this.getPoolKey(poolName).toBase58())
+                    // console.log("custody key : ", this.getCustodyKey(poolName, tokenMint).toBase58());
+                    // console.log("oracle: ", (await this.getCustodyOracleAccountKey(poolName, tokenMint)).toBase58())
                     //@ts-ignore
-                    return [2 /*return*/, _g.sent()];
+                    return [2 /*return*/, _d.sent()];
                 }
             });
         }); };
@@ -890,7 +879,6 @@ var PerpetualsClient = /** @class */ (function () {
                 switch (_d.label) {
                     case 0:
                         pos = this.getPositionKey(wallet, poolName, tokenMint, side);
-                        console.log("pos:", pos.toBase58());
                         _b = (_a = this.program.methods
                             .getPnl({}))
                             .accounts;
@@ -908,7 +896,9 @@ var PerpetualsClient = /** @class */ (function () {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2 /*return*/, _d.sent()];
+                    case 2: 
+                    // console.log("pos:", pos.toBase58())
+                    return [2 /*return*/, _d.sent()];
                 }
             });
         }); };
@@ -919,7 +909,6 @@ var PerpetualsClient = /** @class */ (function () {
                 switch (_d.label) {
                     case 0:
                         pos = this.getPositionKey(wallet, poolName, tokenMint, side);
-                        console.log("pos:", pos.toBase58());
                         _b = (_a = this.program.methods
                             .getPnl({}))
                             .accounts;
@@ -937,7 +926,9 @@ var PerpetualsClient = /** @class */ (function () {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2 /*return*/, _d.sent()];
+                    case 2: 
+                    // console.log("pos:", pos.toBase58())
+                    return [2 /*return*/, _d.sent()];
                 }
             });
         }); };
@@ -1038,11 +1029,228 @@ var PerpetualsClient = /** @class */ (function () {
         // TODO:  ATA check - else create  - DONE 
         // Create WSOL Token account and not ATA and close it in end 
         // TODO:  close other Accounts - NOT NEEDED
-        this.openPosition = function (payTokenSymbol, priceAfterSlippage, collateral, fee, size, side, poolConfig, createUserWSOLATA // if false will also skip balance checks 
+        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, 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 = _b.sent();
+                            preInstructions = [];
+                            instructions = [];
+                            postInstructions = [];
+                            additionalSigners = [];
+                            _b.label = 2;
+                        case 2:
+                            _b.trys.push([2, 10, , 11]);
+                            if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3 /*break*/, 4];
+                            console.log("payTokenSymbol === sol", payTokenSymbol);
+                            wrappedSolAccount = new web3_js_1.Keypair();
+                            return [4 /*yield*/, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
+                        case 3:
+                            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:
+                            if (!(createUserWSOLATA == false)) return [3 /*break*/, 5];
+                            console.log("skip WSOL checks and creation ,since createUserWSOLATA == false");
+                            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 (!(_b.sent())) {
+                                throw "Insufficient Funds , token Account doesn't exist";
+                            }
+                            if (!!skipBalanceChecks) return [3 /*break*/, 8];
+                            _a = anchor_1.BN.bind;
+                            return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(userCustodyTokenAccount)];
+                        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");
+                            }
+                            _b.label = 8;
+                        case 8:
+                            positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
+                                Buffer.from("position"),
+                                publicKey.toBuffer(),
+                                poolConfig.poolAddress.toBuffer(),
+                                payTokenCustody.custodyAccount.toBuffer(),
+                                (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
+                            ], this.programId)[0];
+                            params = {
+                                price: priceAfterSlippage,
+                                collateral: collateralWithfee,
+                                size: size,
+                                side: side,
+                            };
+                            return [4 /*yield*/, this.program.methods
+                                    .openPosition(params)
+                                    .accounts({
+                                    owner: publicKey,
+                                    fundingAccount: payTokenSymbol == 'SOL' ? wrappedSolAccount.publicKey : userCustodyTokenAccount,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    position: positionAccount,
+                                    custody: payTokenCustody.custodyAccount,
+                                    custodyOracleAccount: payTokenCustody.oracleAddress,
+                                    custodyTokenAccount: payTokenCustody.tokenAccount,
+                                    systemProgram: web3_js_1.SystemProgram.programId,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                }).instruction()];
+                        case 9:
+                            instruction = _b.sent();
+                            instructions.push(instruction);
+                            return [3 /*break*/, 11];
+                        case 10:
+                            error_2 = _b.sent();
+                            console.log("perpClient openPosition error:", error_2);
+                            return [3 /*break*/, 11];
+                        case 11: return [2 /*return*/, {
+                                instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
+            });
+        };
+        // TODO: handle SOL wrapping to WSOL and create a ATA - NOT NEEDED
+        // TODO : Balance checks - NOT NEEDED
+        // 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, 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];
+                            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
+                            }];
+                    }
+                });
+            });
+        };
+        // ==== OLD 
+        // 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.openPositionOld = function (payTokenSymbol, priceAfterSlippage, collateral, fee, size, side, poolConfig, createUserWSOLATA // if false will also skip balance checks 
         ) {
             if (createUserWSOLATA === void 0) { createUserWSOLATA = true; }
             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;
+                var publicKey, payTokenCustody, userCustodyTokenAccount, instructions, wsolAssociatedTokenAccount, wsolATAExist, collateralWithfee, wsolBalance, _a, _b, unWrappedSolBalance, _c, totalSolBal, conversionAmt, tokenAccountBalance, _d, positionAccount, params, instruction, error_4;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -1155,85 +1363,82 @@ var PerpetualsClient = /** @class */ (function () {
                             instructions.push(instruction);
                             return [3 /*break*/, 16];
                         case 15:
-                            error_2 = _e.sent();
-                            console.log("perpClient openPosition error:", error_2);
+                            error_4 = _e.sent();
+                            console.log("perpClient openPosition error:", error_4);
                             return [3 /*break*/, 16];
                         case 16: return [2 /*return*/, instructions];
                     }
                 });
             });
         };
+        // ==== OLD 
         // TODO: handle SOL wrapping to WSOL and create a ATA - NOT NEEDED
         // TODO : Balance checks - NOT NEEDED
         // 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, closeUsersWSOLATA // to get back WSOL=>SOL
-        ) {
-            if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
-            return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, userReceivingTokenAccount, instructions, receivingTokenCustody, positionAccount, params, instruction, closeWsolATAIns, error_3;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            console.log("close position :::", receivingTokenSymbol, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey.toBase58());
-                            publicKey = this.provider.wallet.publicKey;
-                            return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey, publicKey)];
-                        case 1:
-                            userReceivingTokenAccount = _a.sent();
-                            instructions = [];
-                            _a.label = 2;
-                        case 2:
-                            _a.trys.push([2, 5, , 6]);
-                            return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                        case 3:
-                            if (!(_a.sent())) {
-                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey));
-                            }
-                            receivingTokenCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey); });
-                            positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                                Buffer.from("position"),
-                                publicKey.toBuffer(),
-                                poolConfig.poolAddress.toBuffer(),
-                                receivingTokenCustody.custodyAccount.toBuffer(),
-                                (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
-                            ], this.programId)[0];
-                            console.log("positionAccount:", positionAccount.toBase58());
-                            params = {
-                                price: priceAfterSlippage,
-                            };
-                            return [4 /*yield*/, this.program.methods
-                                    .closePosition(params)
-                                    .accounts({
-                                    owner: publicKey,
-                                    receivingAccount: userReceivingTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
-                                    position: positionAccount,
-                                    custody: receivingTokenCustody.custodyAccount,
-                                    custodyOracleAccount: receivingTokenCustody.oracleAddress,
-                                    custodyTokenAccount: receivingTokenCustody.tokenAccount,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                }).instruction()];
-                        case 4:
-                            instruction = _a.sent();
-                            instructions.push(instruction);
-                            // SOL is only retrievable by closing the token account and choosing the desired address to send the token account's lamports.
-                            if (receivingTokenSymbol == 'SOL' && closeUsersWSOLATA) {
-                                closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
-                                instructions.push(closeWsolATAIns);
-                            }
-                            return [3 /*break*/, 6];
-                        case 5:
-                            error_3 = _a.sent();
-                            console.error("perpclient closePosition error:", error_3);
-                            return [3 /*break*/, 6];
-                        case 6: return [2 /*return*/, instructions];
-                    }
-                });
+        this.closePositionOld = function (receivingTokenSymbol, priceAfterSlippage, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, userReceivingTokenAccount, instructions, receivingTokenCustody, positionAccount, params, instruction, closeWsolATAIns, error_5;
+            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_5 = _a.sent();
+                        console.error("perpclient closePosition error:", error_5);
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/, instructions];
+                }
             });
-        };
+        }); };
         // TODO: ATA check - else create  - DONE 
         // TODO: handle SOL wrapping to WSOL and create a ATA - DONE
         // TODO : Balance checks - NOT NEEDED
@@ -1359,7 +1564,7 @@ var PerpetualsClient = /** @class */ (function () {
                             return [3 /*break*/, 18];
                         case 17:
                             err_2 = _e.sent();
-                            console.log("perpClient Swap error:: ", err_2);
+                            console.error("perpClient Swap error:: ", err_2);
                             throw err_2;
                         case 18: return [2 /*return*/, instructions];
                     }