flash-sdk 1.0.24 → 1.0.26

package/dist/PerpetualsClient.js

@@ -68,7 +68,7 @@ var OraclePrice_1 = require("./OraclePrice");
 var perpetuals_1 = require("./idl/perpetuals");
 var rpc_1 = require("./utils/rpc");
 var utils_1 = require("./utils");
-var PerpetualsClient = /** @class */ (function () {
+var PerpetualsClient = (function () {
     function PerpetualsClient(provider, programId, opts) {
         var _this = this;
         var _a;
@@ -108,7 +108,7 @@ var PerpetualsClient = /** @class */ (function () {
         };
         this.getPerpetuals = function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.program.account.perpetuals.fetch(this.perpetuals.publicKey)];
+                return [2, this.program.account.perpetuals.fetch(this.perpetuals.publicKey)];
             });
         }); };
         this.getPoolKey = function (name) {
@@ -116,18 +116,17 @@ 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())
-                return [2 /*return*/, this.program.account.pool.fetch(this.getPoolKey(name))];
+                return [2, this.program.account.pool.fetch(this.getPoolKey(name))];
             });
         }); };
         this.getPools = function () { return __awaiter(_this, void 0, void 0, function () {
             var perpetuals;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getPerpetuals()];
+                    case 0: return [4, this.getPerpetuals()];
                     case 1:
                         perpetuals = _a.sent();
-                        return [2 /*return*/, this.program.account.pool.fetchMultiple(perpetuals.pools)];
+                        return [2, this.program.account.pool.fetchMultiple(perpetuals.pools)];
                 }
             });
         }); };
@@ -150,8 +149,8 @@ var PerpetualsClient = /** @class */ (function () {
         this.getCustodyOracleAccountKey = function (poolName, tokenMint) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getCustody(poolName, tokenMint)];
-                    case 1: return [2 /*return*/, (_a.sent()).oracle.oracleAccount];
+                    case 0: return [4, this.getCustody(poolName, tokenMint)];
+                    case 1: return [2, (_a.sent()).oracle.oracleAccount];
                 }
             });
         }); };
@@ -163,18 +162,17 @@ 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());
-                return [2 /*return*/, this.program.account.custody.fetch(this.getCustodyKey(poolName, tokenMint))];
+                return [2, this.program.account.custody.fetch(this.getCustodyKey(poolName, tokenMint))];
             });
         }); };
         this.getCustodies = function (poolName) { return __awaiter(_this, void 0, void 0, function () {
             var pool;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getPool(poolName)];
+                    case 0: return [4, this.getPool(poolName)];
                     case 1:
                         pool = _a.sent();
-                        return [2 /*return*/, this.program.account.custody.fetchMultiple(pool.custodies)];
+                        return [2, this.program.account.custody.fetchMultiple(pool.custodies)];
                 }
             });
         }); };
@@ -182,10 +180,10 @@ var PerpetualsClient = /** @class */ (function () {
             var pool, custodies, custodyMetas, _i, _a, custody, _b, custodies_1, custody;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.getPool(poolName)];
+                    case 0: return [4, this.getPool(poolName)];
                     case 1:
                         pool = _c.sent();
-                        return [4 /*yield*/, this.program.account.custody.fetchMultiple(pool.custodies)];
+                        return [4, this.program.account.custody.fetchMultiple(pool.custodies)];
                     case 2:
                         custodies = _c.sent();
                         custodyMetas = [];
@@ -205,13 +203,13 @@ var PerpetualsClient = /** @class */ (function () {
                                 pubkey: custody === null || custody === void 0 ? void 0 : custody.oracle.oracleAccount,
                             });
                         }
-                        return [2 /*return*/, custodyMetas];
+                        return [2, custodyMetas];
                 }
             });
         }); };
         this.getMultisig = function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.program.account.multisig.fetch(this.multisig.publicKey)];
+                return [2, this.program.account.multisig.fetch(this.multisig.publicKey)];
             });
         }); };
         this.getPositionKey = function (wallet, poolName, tokenMint, side) {
@@ -226,12 +224,12 @@ var PerpetualsClient = /** @class */ (function () {
         };
         this.getPosition = function (postionKey) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.program.account.position.fetch(postionKey)];
+                return [2, this.program.account.position.fetch(postionKey)];
             });
         }); };
         this.getUserPosition = function (wallet, poolName, tokenMint, side) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.program.account.position.fetch(this.getPositionKey(wallet, poolName, tokenMint, side))];
+                return [2, this.program.account.position.fetch(this.getPositionKey(wallet, poolName, tokenMint, side))];
             });
         }); };
         this.getUserPositions = function (wallet, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
@@ -242,10 +240,10 @@ var PerpetualsClient = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         positionKeys = __spreadArray(__spreadArray([], poolConfig.getNonStableTokens().map(function (mint) { return _this.getPositionKey(wallet, poolConfig.poolName, mint, 'long'); }), true), poolConfig.getNonStableTokens().map(function (mint) { return _this.getPositionKey(wallet, poolConfig.poolName, mint, 'short'); }), true);
-                        return [4 /*yield*/, this.provider.connection.getMultipleAccountsInfo(positionKeys)];
+                        return [4, this.provider.connection.getMultipleAccountsInfo(positionKeys)];
                     case 1:
                         positionsDatas = (_a = (_b.sent())) !== null && _a !== void 0 ? _a : [];
-                        return [2 /*return*/, positionsDatas
+                        return [2, positionsDatas
                                 .map(function (p, i) { return ({ pubkey: positionKeys[i], data: p }); })
                                 .filter(function (f) { return f.data !== null; })
                                 .map(function (k) { return (__assign({ pubkey: k.pubkey }, _this.program.account.position.coder.accounts.decode('position', k.data.data))); })];
@@ -261,12 +259,12 @@ var PerpetualsClient = /** @class */ (function () {
                         poolKey = this.getPoolKey(poolName);
                         custodyKey = this.getCustodyKey(poolName, tokenMint);
                         data = (0, bs58_1.encode)(Buffer.concat([poolKey.toBuffer(), custodyKey.toBuffer()]));
-                        return [4 /*yield*/, this.provider.connection.getProgramAccounts(this.program.programId, {
+                        return [4, this.provider.connection.getProgramAccounts(this.program.programId, {
                                 filters: [{ dataSize: 200 }, { memcmp: { bytes: data, offset: 40 } }],
                             })];
                     case 1:
                         positions = _a.sent();
-                        return [2 /*return*/, Promise.all(positions.map(function (position) {
+                        return [2, Promise.all(positions.map(function (position) {
                                 return _this.program.account.position.fetch(position.pubkey);
                             }))];
                 }
@@ -274,7 +272,7 @@ var PerpetualsClient = /** @class */ (function () {
         }); };
         this.getAllPositions = function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.program.account.position.all()];
+                return [2, this.program.account.position.all()];
             });
         }); };
         this.getAccountDiscriminator = function (name) {
@@ -293,8 +291,6 @@ var PerpetualsClient = /** @class */ (function () {
         this.prettyPrint = function (object) {
             console.log(JSON.stringify(object, null, 2));
         };
-        ///////
-        // instructions
         this.init = function (admins, config) { return __awaiter(_this, void 0, void 0, function () {
             var perpetualsProgramData, adminMetas, _i, admins_1, admin;
             return __generator(this, function (_a) {
@@ -310,7 +306,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 pubkey: admin,
                             });
                         }
-                        return [4 /*yield*/, this.program.methods
+                        return [4, this.program.methods
                                 .init(config)
                                 .accounts({
                                 upgradeAuthority: this.provider.wallet.publicKey,
@@ -330,7 +326,7 @@ var PerpetualsClient = /** @class */ (function () {
                             })];
                     case 1:
                         _a.sent();
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         }); };
@@ -351,7 +347,7 @@ var PerpetualsClient = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.program.methods
+                        return [4, this.program.methods
                                 .setAdminSigners({
                                 minSignatures: minSignatures,
                             })
@@ -360,26 +356,24 @@ var PerpetualsClient = /** @class */ (function () {
                                 multisig: this.multisig.publicKey,
                             })
                                 .remainingAccounts(adminMetas)
-                                // .signers([this.admin])
                                 .rpc()];
                     case 2:
                         _a.sent();
-                        return [3 /*break*/, 4];
+                        return [3, 4];
                     case 3:
                         err_1 = _a.sent();
-                        // @ts-ignore
                         if (this.printErrors) {
                             console.error("setAdminSigners err:", err_1);
                         }
                         throw err_1;
-                    case 4: return [2 /*return*/];
+                    case 4: return [2];
                 }
             });
         }); };
         this.addPool = function (name) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.program.methods
+                    case 0: return [4, this.program.methods
                             .addPool({ name: name })
                             .accounts({
                             admin: this.provider.wallet.publicKey,
@@ -392,7 +386,6 @@ var PerpetualsClient = /** @class */ (function () {
                             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                             rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                         })
-                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -400,14 +393,14 @@ var PerpetualsClient = /** @class */ (function () {
                         })];
                     case 1:
                         _a.sent();
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         }); };
         this.removePool = function (name) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.program.methods
+                    case 0: return [4, this.program.methods
                             .removePool({})
                             .accounts({
                             admin: this.admin,
@@ -417,7 +410,6 @@ var PerpetualsClient = /** @class */ (function () {
                             pool: this.getPoolKey(name),
                             systemProgram: web3_js_1.SystemProgram.programId,
                         })
-                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -425,7 +417,7 @@ var PerpetualsClient = /** @class */ (function () {
                         })];
                     case 1:
                         _a.sent();
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         }); };
@@ -435,8 +427,7 @@ var PerpetualsClient = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.program.methods
-                                // @ts-ignore
+                        return [4, this.program.methods
                                 .addCustody({
                                 isStable: isStable,
                                 oracle: oracle,
@@ -459,7 +450,6 @@ var PerpetualsClient = /** @class */ (function () {
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                             })
-                                // .signers([this.admin])
                                 .rpc()
                                 .catch(function (err) {
                                 console.error(err);
@@ -468,12 +458,12 @@ var PerpetualsClient = /** @class */ (function () {
                     case 1:
                         trx_id = _a.sent();
                         console.log("trx_id:", "https://explorer.solana.com/tx/".concat(trx_id, "?cluster=devnet"));
-                        return [3 /*break*/, 3];
+                        return [3, 3];
                     case 2:
                         error_1 = _a.sent();
                         console.error("cli error :", error_1);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        return [3, 3];
+                    case 3: return [2];
                 }
             });
         }); };
@@ -481,8 +471,7 @@ var PerpetualsClient = /** @class */ (function () {
             var trx_id;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.program.methods
-                            //@ts-ignore
+                    case 0: return [4, this.program.methods
                             .testingEditCustody({
                             isStable: isStable,
                             oracle: oracle,
@@ -505,7 +494,6 @@ var PerpetualsClient = /** @class */ (function () {
                             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                             rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                         })
-                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -514,14 +502,14 @@ var PerpetualsClient = /** @class */ (function () {
                     case 1:
                         trx_id = _a.sent();
                         console.log("trx_id:", "https://explorer.solana.com/tx/".concat(trx_id, "?cluster=devnet"));
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         }); };
         this.removeCustody = function (poolName, tokenMint, ratios) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.program.methods
+                    case 0: return [4, this.program.methods
                             .removeCustody({ ratios: ratios })
                             .accounts({
                             admin: this.admin,
@@ -534,7 +522,6 @@ var PerpetualsClient = /** @class */ (function () {
                             systemProgram: web3_js_1.SystemProgram.programId,
                             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                         })
-                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -542,14 +529,14 @@ var PerpetualsClient = /** @class */ (function () {
                         })];
                     case 1:
                         _a.sent();
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         }); };
         this.upgradeCustody = function (poolName, tokenMint) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.program.methods
+                    case 0: return [4, this.program.methods
                             .upgradeCustody({})
                             .accounts({
                             admin: this.admin,
@@ -558,7 +545,6 @@ var PerpetualsClient = /** @class */ (function () {
                             custody: this.getCustodyKey(poolName, tokenMint),
                             systemProgram: web3_js_1.SystemProgram.programId,
                         })
-                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -566,7 +552,7 @@ var PerpetualsClient = /** @class */ (function () {
                         })];
                     case 1:
                         _a.sent();
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         }); };
@@ -589,8 +575,8 @@ var PerpetualsClient = /** @class */ (function () {
                             position: this.getPositionKey(wallet, poolName, tokenMint, side),
                             custody: this.getCustodyKey(poolName, tokenMint)
                         };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
                                 _c.custodyTokenAccount = this.getCustodyTokenAccountKey(poolName, tokenMint),
                                 _c.tokenProgram = spl_token_1.TOKEN_PROGRAM_ID,
                                 _c)])
@@ -599,7 +585,7 @@ var PerpetualsClient = /** @class */ (function () {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2 /*return*/, _d.sent()];
+                    case 2: return [2, _d.sent()];
                 }
             });
         }); };
@@ -615,20 +601,19 @@ var PerpetualsClient = /** @class */ (function () {
                         }))
                             .accounts;
                         _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 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
                                 _c)])
                             .view()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2 /*return*/, _d.sent()];
+                    case 2: return [2, _d.sent()];
                 }
             });
         }); };
@@ -648,20 +633,20 @@ var PerpetualsClient = /** @class */ (function () {
                             pool: this.getPoolKey(poolName),
                             custody: this.getCustodyKey(poolName, tokenMint)
                         };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
                     case 1:
                         _d = (_a = _c.apply(_b, [(_e.custodyOracleAccount = _f.sent(),
                                 _e.lpTokenMint = this.getPoolLpTokenKey(poolName),
                                 _e)]))
                             .remainingAccounts;
-                        return [4 /*yield*/, this.getCustodyMetas(poolName)];
-                    case 2: return [4 /*yield*/, _d.apply(_a, [_f.sent()])
+                        return [4, this.getCustodyMetas(poolName)];
+                    case 2: return [4, _d.apply(_a, [_f.sent()])
                             .view()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 3: return [2 /*return*/, _f.sent()];
+                    case 3: return [2, _f.sent()];
                 }
             });
         }); };
@@ -681,20 +666,20 @@ var PerpetualsClient = /** @class */ (function () {
                             pool: this.getPoolKey(poolName),
                             custody: this.getCustodyKey(poolName, tokenMint)
                         };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
                     case 1:
                         _d = (_a = _c.apply(_b, [(_e.custodyOracleAccount = _f.sent(),
                                 _e.lpTokenMint = this.getPoolLpTokenKey(poolName),
                                 _e)]))
                             .remainingAccounts;
-                        return [4 /*yield*/, this.getCustodyMetas(poolName)];
-                    case 2: return [4 /*yield*/, _d.apply(_a, [_f.sent()])
+                        return [4, this.getCustodyMetas(poolName)];
+                    case 2: return [4, _d.apply(_a, [_f.sent()])
                             .view()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 3: return [2 /*return*/, _f.sent()];
+                    case 3: return [2, _f.sent()];
                 }
             });
         }); };
@@ -705,7 +690,6 @@ var PerpetualsClient = /** @class */ (function () {
                 switch (_d.label) {
                     case 0:
                         _b = (_a = this.program.methods
-                            //@ts-ignore
                             .getEntryPriceAndFee({
                             collateral: collateral,
                             size: size,
@@ -713,26 +697,19 @@ var PerpetualsClient = /** @class */ (function () {
                         }))
                             .accounts;
                         _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 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
                                 _c)])
                             .view()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    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*/, _d.sent()];
+                    case 2: return [2, _d.sent()];
                 }
             });
         }); };
@@ -751,15 +728,15 @@ var PerpetualsClient = /** @class */ (function () {
                             position: this.getPositionKey(wallet, poolName, tokenMint, side),
                             custody: this.getCustodyKey(poolName, tokenMint)
                         };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
                                 _c)])
                             .view()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2 /*return*/, _d.sent()];
+                    case 2: return [2, _d.sent()];
                 }
             });
         }); };
@@ -784,15 +761,15 @@ var PerpetualsClient = /** @class */ (function () {
                                 position: this.getPositionKey(wallet, poolName, tokenMint, side),
                                 custody: this.getCustodyKey(poolName, tokenMint)
                             };
-                            return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                        case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                            return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                        case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
                                     _c)])
                                 .view()
                                 .catch(function (err) {
                                 console.error(err);
                                 throw err;
                             })];
-                        case 2: return [2 /*return*/, _d.sent()];
+                        case 2: return [2, _d.sent()];
                     }
                 });
             });
@@ -818,24 +795,22 @@ var PerpetualsClient = /** @class */ (function () {
                                 position: this.getPositionKey(wallet, poolName, tokenMint, side),
                                 custody: this.getCustodyKey(poolName, tokenMint)
                             };
-                            return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                        case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                            return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                        case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
                                     _c)])
                                 .rpc()
                                 .catch(function (err) {
                                 console.error(err);
                                 throw err;
                             })];
-                        case 2: return [2 /*return*/, _d.sent()];
+                        case 2: return [2, _d.sent()];
                     }
                 });
             });
         };
-        // TODO: currently just static, need to write 
         this.getLiquidationPrice = function (postionKey, postionData, tokenPrice, tokenEmaPrice, custodyAccount, poolAccount, currentTime, addCollateral, removeCollateral) {
             if (addCollateral === void 0) { addCollateral = new anchor_1.BN(0); }
             if (removeCollateral === void 0) { removeCollateral = new anchor_1.BN(0); }
-            // const positionAccount = PositionAccount.from(postionKey, postionData);
             var x;
             if ((0, types_1.isVariant)(postionData.side, 'long')) {
                 x = tokenPrice.price.mul(new anchor_1.BN(90)).div(new anchor_1.BN(90));
@@ -860,15 +835,15 @@ var PerpetualsClient = /** @class */ (function () {
                             position: this.getPositionKey(wallet, poolName, tokenMint, side),
                             custody: this.getCustodyKey(poolName, tokenMint)
                         };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
                                 _c)])
                             .view()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2 /*return*/, _d.sent()];
+                    case 2: return [2, _d.sent()];
                 }
             });
         }); };
@@ -888,17 +863,15 @@ var PerpetualsClient = /** @class */ (function () {
                             position: pos,
                             custody: this.getCustodyKey(poolName, tokenMint)
                         };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
                                 _c)])
                             .view()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: 
-                    // console.log("pos:", pos.toBase58())
-                    return [2 /*return*/, _d.sent()];
+                    case 2: return [2, _d.sent()];
                 }
             });
         }); };
@@ -918,24 +891,20 @@ var PerpetualsClient = /** @class */ (function () {
                             position: pos,
                             custody: this.getCustodyKey(poolName, tokenMint)
                         };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
+                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
                                 _c)])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: 
-                    // console.log("pos:", pos.toBase58())
-                    return [2 /*return*/, _d.sent()];
+                    case 2: return [2, _d.sent()];
                 }
             });
         }); };
         this.getPnl = function (postionKey, postionData, tokenPrice, tokenEmaPrice, custodyAccount, poolAccount, currentTime) {
             var positionAccount = PositionAccount_1.PositionAccount.from(postionKey, postionData);
-            // console.log("positionAccount:",positionAccount);
-            // console.log("side :", postionData.side, (isVariant(postionData.side, 'long')))
             var _a = poolAccount.getPnlUsd(positionAccount, tokenPrice, tokenEmaPrice, custodyAccount, currentTime, false), profit = _a.profit, loss = _a.loss, exitFee = _a.exitFee;
             return {
                 profit: profit,
@@ -958,19 +927,19 @@ var PerpetualsClient = /** @class */ (function () {
                             pool: this.getPoolKey(poolName),
                             receivingCustody: this.getCustodyKey(poolName, tokenMintIn)
                         };
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMintIn)];
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMintIn)];
                     case 1:
                         _c.receivingCustodyOracleAccount = _d.sent(),
                             _c.dispensingCustody = this.getCustodyKey(poolName, tokenMintOut);
-                        return [4 /*yield*/, this.getCustodyOracleAccountKey(poolName, tokenMintOut)];
-                    case 2: return [4 /*yield*/, _b.apply(_a, [(_c.dispensingCustodyOracleAccount = _d.sent(),
+                        return [4, this.getCustodyOracleAccountKey(poolName, tokenMintOut)];
+                    case 2: return [4, _b.apply(_a, [(_c.dispensingCustodyOracleAccount = _d.sent(),
                                 _c)])
                             .view()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 3: return [2 /*return*/, _d.sent()];
+                    case 3: return [2, _d.sent()];
                 }
             });
         }); };
@@ -986,14 +955,14 @@ var PerpetualsClient = /** @class */ (function () {
                             pool: this.getPoolKey(poolName),
                         }))
                             .remainingAccounts;
-                        return [4 /*yield*/, this.getCustodyMetas(poolName)];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [_c.sent()])
+                        return [4, this.getCustodyMetas(poolName)];
+                    case 1: return [4, _b.apply(_a, [_c.sent()])
                             .view()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2 /*return*/, _c.sent()];
+                    case 2: return [2, _c.sent()];
                 }
             });
         }); };
@@ -1009,26 +978,20 @@ var PerpetualsClient = /** @class */ (function () {
                             pool: this.getPoolKey(poolName),
                         }))
                             .remainingAccounts;
-                        return [4 /*yield*/, this.getCustodyMetas(poolName)];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [_c.sent()])
+                        return [4, this.getCustodyMetas(poolName)];
+                    case 1: return [4, _b.apply(_a, [_c.sent()])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2 /*return*/, _c.sent()];
+                    case 2: return [2, _c.sent()];
                 }
             });
         }); };
         this.getAumSdk = function (poolAccount, token_prices, token_ema_prices, custodies, aum_calc_mode, currentTime) {
-            // console.log("poolAccount:",poolAccount);
             return poolAccount.getAssetsUnderManagementUsd(token_prices, token_ema_prices, custodies, aum_calc_mode, currentTime);
         };
-        // TODO:  handle SOL wrapping to WSOL and create a ATA - DONE
-        // TODO:  Balance checks - DONE
-        // 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, collateralWithfee, fee, size, side, poolConfig, createUserWSOLATA, skipBalanceChecks) {
             if (createUserWSOLATA === void 0) { createUserWSOLATA = true; }
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
@@ -1040,7 +1003,7 @@ var PerpetualsClient = /** @class */ (function () {
                             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)];
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey, publicKey)];
                         case 1:
                             userCustodyTokenAccount = _b.sent();
                             preInstructions = [];
@@ -1050,10 +1013,10 @@ var PerpetualsClient = /** @class */ (function () {
                             _b.label = 2;
                         case 2:
                             _b.trys.push([2, 10, , 11]);
-                            if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3 /*break*/, 4];
+                            if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3, 4];
                             console.log("payTokenSymbol === sol", payTokenSymbol);
                             wrappedSolAccount = new web3_js_1.Keypair();
-                            return [4 /*yield*/, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
+                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
                         case 3:
                             accCreationLamports = (_b.sent());
                             console.log("accCreationLamports:", accCreationLamports);
@@ -1072,20 +1035,19 @@ var PerpetualsClient = /** @class */ (function () {
                                 (0, spl_token_1.createCloseAccountInstruction)(wrappedSolAccount.publicKey, publicKey, publicKey),
                             ];
                             additionalSigners.push(wrappedSolAccount);
-                            return [3 /*break*/, 8];
+                            return [3, 8];
                         case 4:
-                            if (!(createUserWSOLATA == false)) return [3 /*break*/, 5];
+                            if (!(createUserWSOLATA == false)) return [3, 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)];
+                            return [3, 8];
+                        case 5: return [4, (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];
+                            if (!!skipBalanceChecks) return [3, 8];
                             _a = anchor_1.BN.bind;
-                            return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(userCustodyTokenAccount)];
+                            return [4, this.provider.connection.getTokenAccountBalance(userCustodyTokenAccount)];
                         case 7:
                             tokenAccountBalance = new (_a.apply(anchor_1.BN, [void 0, (_b.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(collateralWithfee)) {
@@ -1106,7 +1068,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 size: size,
                                 side: side,
                             };
-                            return [4 /*yield*/, this.program.methods
+                            return [4, this.program.methods
                                     .openPosition(params)
                                     .accounts({
                                     owner: publicKey,
@@ -1124,12 +1086,12 @@ var PerpetualsClient = /** @class */ (function () {
                         case 9:
                             instruction = _b.sent();
                             instructions.push(instruction);
-                            return [3 /*break*/, 11];
+                            return [3, 11];
                         case 10:
                             error_2 = _b.sent();
                             console.log("perpClient openPosition error:", error_2);
-                            return [3 /*break*/, 11];
-                        case 11: return [2 /*return*/, {
+                            return [3, 11];
+                        case 11: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -1137,13 +1099,7 @@ var PerpetualsClient = /** @class */ (function () {
                 });
             });
         };
-        // 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
-        ) {
+        this.closePosition = function (receivingTokenSymbol, priceAfterSlippage, side, poolConfig, createUserATA, closeUsersWSOLATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
             return __awaiter(_this, void 0, void 0, function () {
@@ -1160,10 +1116,10 @@ var PerpetualsClient = /** @class */ (function () {
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 9, , 10]);
-                            if (!(receivingTokenSymbol == 'SOL')) return [3 /*break*/, 3];
+                            if (!(receivingTokenSymbol == 'SOL')) return [3, 3];
                             wrappedSolAccount = new web3_js_1.Keypair();
                             userReceivingTokenAccount = wrappedSolAccount.publicKey;
-                            return [4 /*yield*/, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
+                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
                         case 2:
                             lamports = (_b.sent());
                             preInstructions = [
@@ -1180,13 +1136,13 @@ var PerpetualsClient = /** @class */ (function () {
                                 (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)];
+                            return [3, 7];
+                        case 3: return [4, (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)];
+                            if (!_a) return [3, 6];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                         case 5:
                             _a = !(_b.sent());
                             _b.label = 6;
@@ -1207,7 +1163,7 @@ var PerpetualsClient = /** @class */ (function () {
                             params = {
                                 price: priceAfterSlippage,
                             };
-                            return [4 /*yield*/, this.program.methods
+                            return [4, this.program.methods
                                     .closePosition(params)
                                     .accounts({
                                     owner: publicKey,
@@ -1228,12 +1184,12 @@ var PerpetualsClient = /** @class */ (function () {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
                                 postInstructions.push(closeWsolATAIns);
                             }
-                            return [3 /*break*/, 10];
+                            return [3, 10];
                         case 9:
                             error_3 = _b.sent();
                             console.error("perpclient closePosition error:", error_3);
-                            return [3 /*break*/, 10];
-                        case 10: return [2 /*return*/, {
+                            return [3, 10];
+                        case 10: return [2, {
                                 instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
                                 additionalSigners: additionalSigners
                             }];
@@ -1241,13 +1197,7 @@ var PerpetualsClient = /** @class */ (function () {
                 });
             });
         };
-        // ==== 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 
-        ) {
+        this.openPositionOld = function (payTokenSymbol, priceAfterSlippage, collateral, fee, size, side, poolConfig, createUserWSOLATA) {
             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_4;
@@ -1257,17 +1207,17 @@ var PerpetualsClient = /** @class */ (function () {
                             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)];
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey, publicKey)];
                         case 1:
                             userCustodyTokenAccount = _e.sent();
                             instructions = [];
                             _e.label = 2;
                         case 2:
                             _e.trys.push([2, 15, , 16]);
-                            if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3 /*break*/, 9];
+                            if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3, 9];
                             console.log("payTokenSymbol === sol", payTokenSymbol);
                             wsolAssociatedTokenAccount = userCustodyTokenAccount;
-                            return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
+                            return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
                         case 3:
                             wsolATAExist = _e.sent();
                             if (!wsolATAExist) {
@@ -1276,26 +1226,23 @@ var PerpetualsClient = /** @class */ (function () {
                             }
                             collateralWithfee = collateral.add(fee);
                             _a = anchor_1.BN.bind;
-                            if (!wsolATAExist) return [3 /*break*/, 5];
-                            return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
+                            if (!wsolATAExist) return [3, 5];
+                            return [4, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
                         case 4:
                             _b = (_e.sent()).value.amount;
-                            return [3 /*break*/, 6];
+                            return [3, 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];
+                            if (!wsolBalance.lt(collateralWithfee)) return [3, 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)];
+                            return [4, 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";
                             }
@@ -1307,22 +1254,21 @@ var PerpetualsClient = /** @class */ (function () {
                             instructions.push(web3_js_1.SystemProgram.transfer({
                                 fromPubkey: publicKey,
                                 toPubkey: wsolAssociatedTokenAccount,
-                                lamports: conversionAmt.toNumber(), // IS IT SAFE TO PUT AS NUMBER
+                                lamports: conversionAmt.toNumber(),
                             }), (0, spl_token_1.createSyncNativeInstruction)(wsolAssociatedTokenAccount));
                             _e.label = 8;
-                        case 8: return [3 /*break*/, 13];
+                        case 8: return [3, 13];
                         case 9:
-                            if (!(createUserWSOLATA == false)) return [3 /*break*/, 10];
+                            if (!(createUserWSOLATA == false)) return [3, 10];
                             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)];
+                            return [3, 13];
+                        case 10: return [4, (0, utils_1.checkIfAccountExists)(userCustodyTokenAccount, this.provider.connection)];
                         case 11:
-                            // for other tokens check if ATA and balance 
                             if (!(_e.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
                             _d = anchor_1.BN.bind;
-                            return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(userCustodyTokenAccount)];
+                            return [4, 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))) {
@@ -1343,7 +1289,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 size: size,
                                 side: side,
                             };
-                            return [4 /*yield*/, this.program.methods
+                            return [4, this.program.methods
                                     .openPosition(params)
                                     .accounts({
                                     owner: publicKey,
@@ -1361,22 +1307,16 @@ var PerpetualsClient = /** @class */ (function () {
                         case 14:
                             instruction = _e.sent();
                             instructions.push(instruction);
-                            return [3 /*break*/, 16];
+                            return [3, 16];
                         case 15:
                             error_4 = _e.sent();
                             console.log("perpClient openPosition error:", error_4);
-                            return [3 /*break*/, 16];
-                        case 16: return [2 /*return*/, instructions];
+                            return [3, 16];
+                        case 16: return [2, 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.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) {
@@ -1384,14 +1324,14 @@ var PerpetualsClient = /** @class */ (function () {
                     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)];
+                        return [4, (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)];
+                        return [4, (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));
@@ -1408,7 +1348,7 @@ var PerpetualsClient = /** @class */ (function () {
                         params = {
                             price: priceAfterSlippage,
                         };
-                        return [4 /*yield*/, this.program.methods
+                        return [4, this.program.methods
                                 .closePosition(params)
                                 .accounts({
                                 owner: publicKey,
@@ -1425,25 +1365,19 @@ var PerpetualsClient = /** @class */ (function () {
                     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];
+                        return [3, 6];
                     case 5:
                         error_5 = _a.sent();
                         console.error("perpclient closePosition error:", error_5);
-                        return [3 /*break*/, 6];
-                    case 6: return [2 /*return*/, instructions];
+                        return [3, 6];
+                    case 6: return [2, instructions];
                 }
             });
         }); };
-        // TODO: ATA check - else create  - DONE 
-        // TODO: handle SOL wrapping to WSOL and create a ATA - DONE
-        // TODO : Balance checks - NOT NEEDED
-        // TODO: for close Accounts - DONE BY ANCHOR
-        // TODO : if out token WSOL -> unwrap to SOL - DONE
         this.swap = function (poolReceivingTokenSymbol, poolDispensingTokenSymbol, amountIn, minAmountOut, poolConfig, unWrapSol) {
             if (unWrapSol === void 0) { unWrapSol = false; }
             return __awaiter(_this, void 0, void 0, function () {
@@ -1466,23 +1400,23 @@ var PerpetualsClient = /** @class */ (function () {
                             _e.label = 1;
                         case 1:
                             _e.trys.push([1, 17, , 18]);
-                            return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(poolDispensingCustodyConfig.mintKey, publicKey)];
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolDispensingCustodyConfig.mintKey, publicKey)];
                         case 2:
                             userReceivingTokenAccount = _e.sent();
-                            return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                            return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                         case 3:
                             if (!(_e.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolDispensingCustodyConfig.mintKey));
                             }
-                            return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(poolReceivingCustodyConfig.mintKey, publicKey)];
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolReceivingCustodyConfig.mintKey, publicKey)];
                         case 4:
                             userDispensingCustodyTokenAccount = _e.sent();
-                            if (!(userDispensingTokenSymbol == 'SOL')) return [3 /*break*/, 12];
+                            if (!(userDispensingTokenSymbol == 'SOL')) return [3, 12];
                             console.log("userDispensingTokenSymbol === sol", userDispensingTokenSymbol);
-                            return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, publicKey)];
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, publicKey)];
                         case 5:
                             wsolAssociatedTokenAccount = _e.sent();
-                            return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
+                            return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
                         case 6:
                             wsolATAExist = _e.sent();
                             if (!wsolATAExist) {
@@ -1490,19 +1424,19 @@ var PerpetualsClient = /** @class */ (function () {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
                             }
                             _a = anchor_1.BN.bind;
-                            if (!wsolATAExist) return [3 /*break*/, 8];
-                            return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
+                            if (!wsolATAExist) return [3, 8];
+                            return [4, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
                         case 7:
                             _b = (_e.sent()).value.amount;
-                            return [3 /*break*/, 9];
+                            return [3, 9];
                         case 8:
                             _b = 0;
                             _e.label = 9;
                         case 9:
                             wsolBalance = new (_a.apply(anchor_1.BN, [void 0, _b]))();
-                            if (!wsolBalance.lt(amountIn)) return [3 /*break*/, 11];
+                            if (!wsolBalance.lt(amountIn)) return [3, 11];
                             _c = anchor_1.BN.bind;
-                            return [4 /*yield*/, this.provider.connection.getBalance(publicKey)];
+                            return [4, this.provider.connection.getBalance(publicKey)];
                         case 10:
                             unWrappedSolBalance = new (_c.apply(anchor_1.BN, [void 0, _e.sent()]))();
                             totalSolBal = unWrappedSolBalance.add(wsolBalance);
@@ -1513,17 +1447,17 @@ var PerpetualsClient = /** @class */ (function () {
                             instructions.push(web3_js_1.SystemProgram.transfer({
                                 fromPubkey: publicKey,
                                 toPubkey: wsolAssociatedTokenAccount,
-                                lamports: conversionAmt.toNumber(), // IS IT SAFE TO PUT AS NUMBER ?
+                                lamports: conversionAmt.toNumber(),
                             }), (0, spl_token_1.createSyncNativeInstruction)(wsolAssociatedTokenAccount));
                             _e.label = 11;
-                        case 11: return [3 /*break*/, 15];
-                        case 12: return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userDispensingCustodyTokenAccount, this.provider.connection)];
+                        case 11: return [3, 15];
+                        case 12: return [4, (0, utils_1.checkIfAccountExists)(userDispensingCustodyTokenAccount, this.provider.connection)];
                         case 13:
                             if (!(_e.sent())) {
                                 throw "Insufficient Funds , Token Account doesn't exist";
                             }
                             _d = anchor_1.BN.bind;
-                            return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(userDispensingCustodyTokenAccount)];
+                            return [4, this.provider.connection.getTokenAccountBalance(userDispensingCustodyTokenAccount)];
                         case 14:
                             tokenAccountBalance = new (_d.apply(anchor_1.BN, [void 0, (_e.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(amountIn)) {
@@ -1535,7 +1469,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 amountIn: amountIn,
                                 minAmountOut: minAmountOut,
                             };
-                            return [4 /*yield*/, this.program.methods
+                            return [4, this.program.methods
                                     .swap(params)
                                     .accounts({
                                     owner: publicKey,
@@ -1556,17 +1490,16 @@ var PerpetualsClient = /** @class */ (function () {
                         case 16:
                             inx = _e.sent();
                             instructions.push(inx);
-                            // SOL is only retrievable by closing the token account and choosing the desired address to send the token account's lamports.
                             if (userReceivingTokenSymbol == 'SOL' && unWrapSol) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
                                 instructions.push(closeWsolATAIns);
                             }
-                            return [3 /*break*/, 18];
+                            return [3, 18];
                         case 17:
                             err_2 = _e.sent();
                             console.error("perpClient Swap error:: ", err_2);
                             throw err_2;
-                        case 18: return [2 /*return*/, instructions];
+                        case 18: return [2, instructions];
                     }
                 });
             });
@@ -1584,12 +1517,12 @@ var PerpetualsClient = /** @class */ (function () {
                         instructions = [];
                         userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(custody.mintKey, publicKey);
                         collateralWithfee = collateralWithoutFee.add(fee);
-                        if (!(collateralSymbol == 'SOL')) return [3 /*break*/, 7];
+                        if (!(collateralSymbol == 'SOL')) return [3, 7];
                         console.log("collateralSymbol === sol", collateralSymbol);
-                        return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, publicKey)];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, publicKey)];
                     case 1:
                         wsolAssociatedTokenAccount = _d.sent();
-                        return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
+                        return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
                     case 2:
                         wsolATAExist = _d.sent();
                         if (!wsolATAExist) {
@@ -1597,19 +1530,19 @@ var PerpetualsClient = /** @class */ (function () {
                             instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
                         }
                         _a = anchor_1.BN.bind;
-                        if (!wsolATAExist) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
+                        if (!wsolATAExist) return [3, 4];
+                        return [4, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
                     case 3:
                         _b = (_d.sent()).value.amount;
-                        return [3 /*break*/, 5];
+                        return [3, 5];
                     case 4:
                         _b = 0;
                         _d.label = 5;
                     case 5:
                         wsolBalance = new (_a.apply(anchor_1.BN, [void 0, _b]))();
-                        if (!wsolBalance.lt(collateralWithfee)) return [3 /*break*/, 7];
+                        if (!wsolBalance.lt(collateralWithfee)) return [3, 7];
                         _c = anchor_1.BN.bind;
-                        return [4 /*yield*/, this.provider.connection.getBalance(publicKey)];
+                        return [4, this.provider.connection.getBalance(publicKey)];
                     case 6:
                         unWrappedSolBalance = new (_c.apply(anchor_1.BN, [void 0, _d.sent()]))();
                         totalSolBal = unWrappedSolBalance.add(wsolBalance);
@@ -1620,10 +1553,10 @@ var PerpetualsClient = /** @class */ (function () {
                         instructions.push(web3_js_1.SystemProgram.transfer({
                             fromPubkey: publicKey,
                             toPubkey: wsolAssociatedTokenAccount,
-                            lamports: conversionAmt.toNumber(), // IS IT SAFE TO PUT AS NUMBER
+                            lamports: conversionAmt.toNumber(),
                         }), (0, spl_token_1.createSyncNativeInstruction)(wsolAssociatedTokenAccount));
                         _d.label = 7;
-                    case 7: return [4 /*yield*/, this.program.methods.addCollateral({
+                    case 7: return [4, this.program.methods.addCollateral({
                             collateral: collateralWithoutFee
                         }).accounts({
                             owner: publicKey,
@@ -1641,7 +1574,7 @@ var PerpetualsClient = /** @class */ (function () {
                     case 8:
                         inx = _d.sent();
                         instructions.push(inx);
-                        return [2 /*return*/, instructions];
+                        return [2, instructions];
                 }
             });
         }); };
@@ -1659,12 +1592,12 @@ var PerpetualsClient = /** @class */ (function () {
                         }
                         instructions = [];
                         userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey);
-                        return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
+                        return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
                     case 1:
                         if (!(_a.sent())) {
                             instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                         }
-                        return [4 /*yield*/, this.program.methods
+                        return [4, this.program.methods
                                 .removeCollateral({
                                 collateralUsd: collateralWithoutFee,
                             })
@@ -1688,16 +1621,11 @@ var PerpetualsClient = /** @class */ (function () {
                             closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
                             instructions.push(closeWsolATAIns);
                         }
-                        return [2 /*return*/, instructions];
+                        return [2, instructions];
                 }
             });
         }); };
-        // 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.addLiquidity = function (payTokenSymbol, tokenAmountIn, minLpAmountOut, // give this value based on slippage 
-        poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+        this.addLiquidity = function (payTokenSymbol, tokenAmountIn, minLpAmountOut, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var payTokenCustody, publicKey, instructions, userPayingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody, wsolAssociatedTokenAccount, wsolATAExist, wsolBalance, _b, _c, unWrappedSolBalance, _d, totalSolBal, conversionAmt, tokenAccountBalance, _e, inx, err_3;
             return __generator(this, function (_f) {
                 switch (_f.label) {
@@ -1711,10 +1639,10 @@ var PerpetualsClient = /** @class */ (function () {
                         _f.label = 1;
                     case 1:
                         _f.trys.push([1, 17, , 18]);
-                        return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(payTokenCustody.mintKey, publicKey)];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(payTokenCustody.mintKey, publicKey)];
                     case 2:
                         userPayingTokenAccount = _f.sent();
-                        return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
                     case 3:
                         lpTokenAccount = _f.sent();
                         custodyAccountMetas = [];
@@ -1732,17 +1660,17 @@ var PerpetualsClient = /** @class */ (function () {
                                 isWritable: false,
                             });
                         }
-                        return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
+                        return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
                     case 4:
                         if (!(_f.sent())) {
                             instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.lpTokenMint));
                         }
-                        if (!(payTokenSymbol == 'SOL')) return [3 /*break*/, 12];
+                        if (!(payTokenSymbol == 'SOL')) return [3, 12];
                         console.log("payTokenSymbol === sol", payTokenSymbol);
-                        return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, publicKey)];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, publicKey)];
                     case 5:
                         wsolAssociatedTokenAccount = _f.sent();
-                        return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
+                        return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
                     case 6:
                         wsolATAExist = _f.sent();
                         if (!wsolATAExist) {
@@ -1750,19 +1678,19 @@ var PerpetualsClient = /** @class */ (function () {
                             instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
                         }
                         _b = anchor_1.BN.bind;
-                        if (!wsolATAExist) return [3 /*break*/, 8];
-                        return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
+                        if (!wsolATAExist) return [3, 8];
+                        return [4, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
                     case 7:
                         _c = (_f.sent()).value.amount;
-                        return [3 /*break*/, 9];
+                        return [3, 9];
                     case 8:
                         _c = 0;
                         _f.label = 9;
                     case 9:
                         wsolBalance = new (_b.apply(anchor_1.BN, [void 0, _c]))();
-                        if (!wsolBalance.lt(tokenAmountIn)) return [3 /*break*/, 11];
+                        if (!wsolBalance.lt(tokenAmountIn)) return [3, 11];
                         _d = anchor_1.BN.bind;
-                        return [4 /*yield*/, this.provider.connection.getBalance(publicKey)];
+                        return [4, this.provider.connection.getBalance(publicKey)];
                     case 10:
                         unWrappedSolBalance = new (_d.apply(anchor_1.BN, [void 0, _f.sent()]))();
                         totalSolBal = unWrappedSolBalance.add(wsolBalance);
@@ -1773,24 +1701,24 @@ var PerpetualsClient = /** @class */ (function () {
                         instructions.push(web3_js_1.SystemProgram.transfer({
                             fromPubkey: publicKey,
                             toPubkey: wsolAssociatedTokenAccount,
-                            lamports: conversionAmt.toNumber(), // IS IT SAFE TO PUT AS NUMBER
+                            lamports: conversionAmt.toNumber(),
                         }), (0, spl_token_1.createSyncNativeInstruction)(wsolAssociatedTokenAccount));
                         _f.label = 11;
-                    case 11: return [3 /*break*/, 15];
-                    case 12: return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
+                    case 11: return [3, 15];
+                    case 12: return [4, (0, utils_1.checkIfAccountExists)(userPayingTokenAccount, this.provider.connection)];
                     case 13:
                         if (!(_f.sent())) {
                             throw "Insufficient Funds , token Account doesn't exist";
                         }
                         _e = anchor_1.BN.bind;
-                        return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(userPayingTokenAccount)];
+                        return [4, this.provider.connection.getTokenAccountBalance(userPayingTokenAccount)];
                     case 14:
                         tokenAccountBalance = new (_e.apply(anchor_1.BN, [void 0, (_f.sent()).value.amount]))();
                         if (tokenAccountBalance.lt(tokenAmountIn)) {
                             throw "Insufficient Funds";
                         }
                         _f.label = 15;
-                    case 15: return [4 /*yield*/, this.program.methods
+                    case 15: return [4, this.program.methods
                             .addLiquidity({
                             amountIn: tokenAmountIn,
                             minLpAmountOut: minLpAmountOut
@@ -1813,22 +1741,16 @@ var PerpetualsClient = /** @class */ (function () {
                     case 16:
                         inx = _f.sent();
                         instructions.push(inx);
-                        return [3 /*break*/, 18];
+                        return [3, 18];
                     case 17:
                         err_3 = _f.sent();
                         console.error("perpClient addLiquidity error:: ", err_3);
                         throw err_3;
-                    case 18: return [2 /*return*/, instructions];
+                    case 18: return [2, instructions];
                 }
             });
         }); };
-        // TODO: handle SOL wrapping to WSOL and create a ATA - NOT NEEDED
-        // TODO :Balance checks - DONE
-        // TODO: ATA check - else create  - DONE 
-        // TODO: for LP close Accounts - DONE
-        // TODO : if out token WSOL -> unwrap to SOL - DONE
-        this.removeLiquidity = function (recieveTokenSymbol, liquidityAmountIn, minTokenAmountOut, // give this value based on slippage 
-        poolConfig, closeLpATA) {
+        this.removeLiquidity = function (recieveTokenSymbol, liquidityAmountIn, minTokenAmountOut, poolConfig, closeLpATA) {
             if (closeLpATA === void 0) { closeLpATA = false; }
             return __awaiter(_this, void 0, void 0, function () {
                 var recieveTokenCustody, publicKey, instructions, userRecievingTokenAccount, lpTokenAccount, custodyAccountMetas, custodyOracleAccountMetas, _i, _a, custody, removeLiquidityTx, closeInx, closeWsolATAIns, err_4;
@@ -1844,15 +1766,15 @@ var PerpetualsClient = /** @class */ (function () {
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 6, , 7]);
-                            return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(recieveTokenCustody.mintKey, publicKey)];
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(recieveTokenCustody.mintKey, publicKey)];
                         case 2:
                             userRecievingTokenAccount = _b.sent();
-                            return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userRecievingTokenAccount, this.provider.connection)];
+                            return [4, (0, utils_1.checkIfAccountExists)(userRecievingTokenAccount, this.provider.connection)];
                         case 3:
                             if (!(_b.sent())) {
                                 instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userRecievingTokenAccount, publicKey, recieveTokenCustody.mintKey));
                             }
-                            return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
                         case 4:
                             lpTokenAccount = _b.sent();
                             custodyAccountMetas = [];
@@ -1871,7 +1793,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 });
                             }
                             console.log("liquidityAmountIn", liquidityAmountIn.toString());
-                            return [4 /*yield*/, this.program.methods
+                            return [4, this.program.methods
                                     .removeLiquidity({
                                     lpAmountIn: liquidityAmountIn,
                                     minAmountOut: minTokenAmountOut
@@ -1898,41 +1820,25 @@ var PerpetualsClient = /** @class */ (function () {
                                 closeInx = (0, spl_token_1.createCloseAccountInstruction)(lpTokenAccount, publicKey, publicKey);
                                 instructions.push(closeInx);
                             }
-                            // SOL is only retrievable by closing the token account and choosing the desired address to send the token account's lamports.
                             if (recieveTokenSymbol == 'SOL') {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userRecievingTokenAccount, publicKey, publicKey);
                                 instructions.push(closeWsolATAIns);
                             }
-                            return [3 /*break*/, 7];
+                            return [3, 7];
                         case 6:
                             err_4 = _b.sent();
                             console.log("perpClient removeLiquidity error:: ", err_4);
                             throw err_4;
-                        case 7: return [2 /*return*/, instructions];
+                        case 7: return [2, instructions];
                     }
                 });
             });
         };
-        // this.provider = AnchorProvider.local(clusterUrl, {
-        //   commitment: "confirmed",
-        //   preflightCommitment: "confirmed",
-        //   skipPreflight: true
-        // });
-        // setProvider(this.provider);
         this.provider = provider;
         (0, anchor_1.setProvider)(provider);
-        // const idl = JSON.parse(  fs.readFileSync("./target/idl/perpetuals.json", "utf8"));
-        // const idl = JSON.parse(IDL);
-        // const program = new anchor.Program(idl, programId, provider);
         this.program = new anchor_1.Program(perpetuals_1.IDL, programId);
         this.programId = programId;
-        //this.program =  workspace.Perpetuals as Program<Perpetuals>;
-        // console.log("client constructor programID : ", this.program.programId.toBase58());
-        // this.admin = Keypair.fromSecretKey(
-        //   new Uint8Array(JSON.parse(readFileSync(adminKey).toString()))
-        // );
         this.admin = this.provider.wallet.publicKey;
-        // console.log("admin:", this.admin.toBase58())
         this.multisig = this.findProgramAddress("multisig");
         this.authority = this.findProgramAddress("transfer_authority");
         this.perpetuals = this.findProgramAddress("perpetuals");
@@ -1949,8 +1855,8 @@ var PerpetualsClient = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, (0, rpc_1.sendTransaction)(this.program.provider, ixs, (_a = opts.alts) !== null && _a !== void 0 ? _a : [], __assign({ postSendTxCallback: this.postSendTxCallback, prioritizationFee: this.prioritizationFee, txConfirmationCommitment: this.txConfirmationCommitment }, opts))];
-                    case 1: return [2 /*return*/, _b.sent()];
+                    case 0: return [4, (0, rpc_1.sendTransaction)(this.program.provider, ixs, (_a = opts.alts) !== null && _a !== void 0 ? _a : [], __assign({ postSendTxCallback: this.postSendTxCallback, prioritizationFee: this.prioritizationFee, txConfirmationCommitment: this.txConfirmationCommitment }, opts))];
+                    case 1: return [2, _b.sent()];
                 }
             });
         });