flash-sdk 1.0.16 → 1.0.18

package/lib/PerpetualsClient.d.ts

@@ -1957,6 +1957,8 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    openPositionOld: (payTokenSymbol: string, priceAfterSlippage: BN, collateral: BN, fee: BN, size: BN, side: Side, poolConfig: PoolConfig, createUserWSOLATA?: boolean) => Promise<TransactionInstruction[]>;
+    closePositionOld: (receivingTokenSymbol: string, priceAfterSlippage: BN, side: Side, poolConfig: PoolConfig) => Promise<TransactionInstruction[]>;
     swap: (poolReceivingTokenSymbol: string, poolDispensingTokenSymbol: string, amountIn: BN, minAmountOut: BN, poolConfig: PoolConfig, unWrapSol?: boolean) => Promise<TransactionInstruction[]>;
     addLiquidity: (payTokenSymbol: string, tokenAmountIn: BN, minLpAmountOut: BN, poolConfig: PoolConfig) => Promise<TransactionInstruction[]>;
     removeLiquidity: (recieveTokenSymbol: string, liquidityAmountIn: BN, minTokenAmountOut: BN, poolConfig: PoolConfig, closeLpATA?: boolean) => Promise<TransactionInstruction[]>;

package/lib/PerpetualsClient.js

@@ -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()];
                 }
             });
         }); };
@@ -1061,44 +1052,6 @@ var PerpetualsClient = /** @class */ (function () {
                             _b.trys.push([2, 10, , 11]);
                             if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3 /*break*/, 4];
                             console.log("payTokenSymbol === sol", payTokenSymbol);
-                            // const wsolAssociatedTokenAccount = userCustodyTokenAccount;
-                            // const wsolATAExist = await checkIfAccountExists(wsolAssociatedTokenAccount, this.provider.connection)
-                            // if (!wsolATAExist) {
-                            //   console.log("wsol ata does not exist");
-                            //   instructions.push(
-                            //     createAssociatedTokenAccountInstruction(
-                            //       publicKey,
-                            //       wsolAssociatedTokenAccount,
-                            //       publicKey,
-                            //       NATIVE_MINT
-                            //     )
-                            //   );
-                            // }
-                            // // get balance of WSOL associated token account
-                            // const wsolBalance = new BN(wsolATAExist ? (await this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)).value.amount : 0);
-                            // if (wsolBalance.lt(collateralWithfee)) {
-                            //   console.log("WSOL balance insufficient \n so Convert SOL to WSOL"); 
-                            //   let unWrappedSolBalance = new BN(await this.provider.connection.getBalance(publicKey));
-                            //   const totalSolBal = unWrappedSolBalance.add(wsolBalance);
-                            //   // const rentExemptSolNeedforATA = new BN(0.02 * LAMPORTS_PER_SOL);
-                            //   // console.log("rentExemptSolNeedforATA:",rentExemptSolNeedforATA.toString())
-                            //   //TODOD ::  add(rentExemptSolNeedforATA)
-                            //   if (totalSolBal.lt(collateralWithfee)) {
-                            //     throw "Insufficient SOL Funds"
-                            //   } else {
-                            //     console.log("SOL balance sufficient so transfer from SOL to WSOL ATA")
-                            //   }
-                            //   let conversionAmt = collateralWithfee.sub(wsolBalance);
-                            //   console.log("conversionAmt:",conversionAmt.toString())
-                            //   instructions.push(
-                            //     SystemProgram.transfer({
-                            //       fromPubkey: publicKey,
-                            //       toPubkey: wsolAssociatedTokenAccount,
-                            //       lamports: conversionAmt.toNumber(), // IS IT SAFE TO PUT AS NUMBER
-                            //     }),
-                            //     createSyncNativeInstruction(wsolAssociatedTokenAccount)
-                            //   );
-                            // }
                             wrappedSolAccount = new web3_js_1.Keypair();
                             return [4 /*yield*/, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
                         case 3:
@@ -1251,7 +1204,6 @@ var PerpetualsClient = /** @class */ (function () {
                                 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,
                             };
@@ -1289,6 +1241,204 @@ 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 
+        ) {
+            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;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            console.log("open position :::", payTokenSymbol, poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey.toBase58());
+                            publicKey = this.provider.wallet.publicKey;
+                            payTokenCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey); });
+                            return [4 /*yield*/, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey, publicKey)];
+                        case 1:
+                            userCustodyTokenAccount = _e.sent();
+                            instructions = [];
+                            _e.label = 2;
+                        case 2:
+                            _e.trys.push([2, 15, , 16]);
+                            if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3 /*break*/, 9];
+                            console.log("payTokenSymbol === sol", payTokenSymbol);
+                            wsolAssociatedTokenAccount = userCustodyTokenAccount;
+                            return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
+                        case 3:
+                            wsolATAExist = _e.sent();
+                            if (!wsolATAExist) {
+                                console.log("wsol ata does not exist");
+                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
+                            }
+                            collateralWithfee = collateral.add(fee);
+                            _a = anchor_1.BN.bind;
+                            if (!wsolATAExist) return [3 /*break*/, 5];
+                            return [4 /*yield*/, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
+                        case 4:
+                            _b = (_e.sent()).value.amount;
+                            return [3 /*break*/, 6];
+                        case 5:
+                            _b = 0;
+                            _e.label = 6;
+                        case 6:
+                            wsolBalance = new (_a.apply(anchor_1.BN, [void 0, _b]))();
+                            if (!wsolBalance.lt(collateralWithfee)) return [3 /*break*/, 8];
+                            console.log("WSOL balance insufficient \n so Convert SOL to WSOL");
+                            _c = anchor_1.BN.bind;
+                            return [4 /*yield*/, this.provider.connection.getBalance(publicKey)];
+                        case 7:
+                            unWrappedSolBalance = new (_c.apply(anchor_1.BN, [void 0, _e.sent()]))();
+                            totalSolBal = unWrappedSolBalance.add(wsolBalance);
+                            // const rentExemptSolNeedforATA = new BN(0.02 * LAMPORTS_PER_SOL);
+                            // console.log("rentExemptSolNeedforATA:",rentExemptSolNeedforATA.toString())
+                            //TODOD ::  add(rentExemptSolNeedforATA)
+                            if (totalSolBal.lt(collateralWithfee)) {
+                                throw "Insufficient SOL Funds";
+                            }
+                            else {
+                                console.log("SOL balance sufficient so transfer from SOL to WSOL ATA");
+                            }
+                            conversionAmt = collateralWithfee.sub(wsolBalance);
+                            console.log("conversionAmt:", conversionAmt.toString());
+                            instructions.push(web3_js_1.SystemProgram.transfer({
+                                fromPubkey: publicKey,
+                                toPubkey: wsolAssociatedTokenAccount,
+                                lamports: conversionAmt.toNumber(), // IS IT SAFE TO PUT AS NUMBER
+                            }), (0, spl_token_1.createSyncNativeInstruction)(wsolAssociatedTokenAccount));
+                            _e.label = 8;
+                        case 8: return [3 /*break*/, 13];
+                        case 9:
+                            if (!(createUserWSOLATA == false)) return [3 /*break*/, 10];
+                            console.log("skip WSOL checks and creation ,since createUserWSOLATA == false");
+                            return [3 /*break*/, 13];
+                        case 10: return [4 /*yield*/, (0, utils_1.checkIfAccountExists)(userCustodyTokenAccount, this.provider.connection)];
+                        case 11:
+                            // 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)];
+                        case 12:
+                            tokenAccountBalance = new (_d.apply(anchor_1.BN, [void 0, (_e.sent()).value.amount]))();
+                            if (tokenAccountBalance.lt(collateral.add(fee))) {
+                                throw "Insufficient Funds";
+                            }
+                            _e.label = 13;
+                        case 13:
+                            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: collateral,
+                                size: size,
+                                side: side,
+                            };
+                            return [4 /*yield*/, this.program.methods
+                                    .openPosition(params)
+                                    .accounts({
+                                    owner: publicKey,
+                                    fundingAccount: 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 14:
+                            instruction = _e.sent();
+                            instructions.push(instruction);
+                            return [3 /*break*/, 16];
+                        case 15:
+                            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.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
@@ -1414,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];
                     }

package/lib/PoolConfig.d.ts

@@ -1,6 +1,7 @@
 import { Address } from '@coral-xyz/anchor';
 import { Cluster, PublicKey } from '@solana/web3.js';
 export interface CustodyConfig {
+    custodyId: number;
     custodyAccount: PublicKey;
     tokenAccount: PublicKey;
     symbol: string;

package/lib/PoolConfig.js

@@ -79,8 +79,9 @@ var PoolConfig = /** @class */ (function () {
         var tokens = poolConfig['tokens'].map(function (i) {
             return __assign(__assign({}, i), { mintKey: new web3_js_1.PublicKey(i.mintKey) });
         });
-        var custodies = poolConfig['custodies'].map(function (i) {
-            return __assign(__assign({}, i), { custodyAccount: new web3_js_1.PublicKey(i.custodyAccount), tokenAccount: new web3_js_1.PublicKey(i.tokenAccount), mintKey: new web3_js_1.PublicKey(i.mintKey), oracleAddress: new web3_js_1.PublicKey(i.oracleAddress) });
+        var custodies = poolConfig['custodies'].map(function (i, index) {
+            var _a;
+            return __assign(__assign({}, i), { custodyId: (_a = i === null || i === void 0 ? void 0 : i.custodyId) !== null && _a !== void 0 ? _a : index, custodyAccount: new web3_js_1.PublicKey(i.custodyAccount), tokenAccount: new web3_js_1.PublicKey(i.tokenAccount), mintKey: new web3_js_1.PublicKey(i.mintKey), oracleAddress: new web3_js_1.PublicKey(i.oracleAddress) });
         });
         return new PoolConfig(new web3_js_1.PublicKey(poolConfig.programId), poolConfig.cluster, poolConfig.poolName, new web3_js_1.PublicKey(poolConfig.poolAddress), new web3_js_1.PublicKey(poolConfig.lpTokenMint), poolConfig.lpDecimals, new web3_js_1.PublicKey(poolConfig.perpetuals), new web3_js_1.PublicKey(poolConfig.transferAuthority), new web3_js_1.PublicKey(poolConfig.multisig), tokens, custodies);
     };

package/lib/PoolConfig.json

@@ -55,6 +55,7 @@
             ],
             "custodies": [
                 {
+                    "custodyId": 0,
                     "custodyAccount": "CkYddgaB8c5tvs9WP11B83HvMaU35ZFpTzLLGg4NviEj",
                     "tokenAccount": "DHy9BXo36hwKkvBJnPd11zH77BefA77mTiL7yu2LNWPx",
                     "symbol": "USDC",
@@ -64,6 +65,7 @@
                     "oracleAddress": "5SSkXsEKQepHHAewytPVwdej4epN1nxgLVM84L4KXgy7"
                 },
                 {
+                    "custodyId": 1,
                     "custodyAccount": "4ueMZBmpTMPykYwTENJs7diYfgx6UBCPQnRwb2F5UFgw",
                     "tokenAccount": "G9bJQdZkzXZsiwouZ8MsZw6p8Pg5vtM9hbVHjfqSrJZo",
                     "symbol": "SOL",
@@ -73,6 +75,7 @@
                     "oracleAddress": "J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix"
                 },
                 {
+                    "custodyId": 2,
                     "custodyAccount": "F9qzX5pHGS5SFfP5M24a8dqXUHQdraexJ3P9TNGF2WFj",
                     "tokenAccount": "y5vPUaQdM3fJkEyn3oA8uFMRzwJYcNJsjBZyW1yRUar",
                     "symbol": "BTC",
@@ -82,6 +85,7 @@
                     "oracleAddress": "HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J"
                 },
                 {
+                    "custodyId": 3,
                     "custodyAccount": "BZggMsfpcpbB3tnhmtM2qJ1uMobKVBEmYZp2jmDrBHZD",
                     "tokenAccount": "HP4CcezCpCZqcoo8BsrroFEaykz2F4bz6sWBCCUJEBPy",
                     "symbol": "ETH",