flash-sdk 1.0.16 → 1.0.18

package/src/PerpetualsClient.ts

@@ -170,7 +170,7 @@ export class PerpetualsClient {
   };
 
   getPool = async (name: string) => {
-    console.log("pool:", this.getPoolKey(name).toBase58())
+    // console.log("pool:", this.getPoolKey(name).toBase58())
     return this.program.account.pool.fetch(this.getPoolKey(name));
   };
 
@@ -214,7 +214,7 @@ export class PerpetualsClient {
   };
 
   getCustody = async (poolName: string, tokenMint: PublicKey) => {
-    console.log("custody key :", this.getCustodyKey(poolName, tokenMint).toBase58());
+    // console.log("custody key :", this.getCustodyKey(poolName, tokenMint).toBase58());
     return this.program.account.custody.fetch(
       this.getCustodyKey(poolName, tokenMint)
     );
@@ -407,7 +407,7 @@ export class PerpetualsClient {
     } catch (err) {
       // @ts-ignore
       if (this.printErrors) {
-        console.log(err);
+        console.error("setAdminSigners err:",err);
       }
       throw err;
     }
@@ -465,8 +465,8 @@ export class PerpetualsClient {
     borrowRate: BorrowRateParams,
     ratios: TokenRatios[]
   ) => {
-    console.log("CustodyKey", this.getCustodyKey(poolName, tokenMint).toBase58())
-    console.log("getCustodyTokenAccountKey", this.getCustodyTokenAccountKey(poolName, tokenMint).toBase58())
+    // console.log("CustodyKey", this.getCustodyKey(poolName, tokenMint).toBase58())
+    // console.log("getCustodyTokenAccountKey", this.getCustodyTokenAccountKey(poolName, tokenMint).toBase58())
     try {
       const trx_id = await this.program.methods
         // @ts-ignore
@@ -504,7 +504,7 @@ export class PerpetualsClient {
 
       console.log("trx_id:", `https://explorer.solana.com/tx/${trx_id}?cluster=devnet`)
     } catch (error) {
-      console.log("cli error :", error);
+      console.error("cli error :", error);
     }
 
 
@@ -521,8 +521,8 @@ export class PerpetualsClient {
     borrowRate: BorrowRateParams,
     ratios: TokenRatios[]
   ) => {
-    console.log("CustodyKey", this.getCustodyKey(poolName, tokenMint).toBase58())
-    console.log("getCustodyTokenAccountKey", this.getCustodyTokenAccountKey(poolName, tokenMint).toBase58())
+    // console.log("editCustody CustodyKey", this.getCustodyKey(poolName, tokenMint).toBase58())
+    // console.log("editCustody getCustodyTokenAccountKey", this.getCustodyTokenAccountKey(poolName, tokenMint).toBase58())
 
     const trx_id = await this.program.methods
       //@ts-ignore
@@ -726,11 +726,10 @@ export class PerpetualsClient {
     size: BN,
     side: PositionSide
   ) => {
-    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("orcalve: ", (await this.getCustodyOracleAccountKey(poolName, tokenMint)).toBase58())
+    // 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 await this.program.methods
@@ -901,7 +900,7 @@ export class PerpetualsClient {
     side: PositionSide
   ) => {
     const pos = this.getPositionKey(wallet, poolName, tokenMint, side);
-    console.log("pos:", pos.toBase58())
+    // console.log("pos:", pos.toBase58())
     return await this.program.methods
       .getPnl({})
       .accounts({
@@ -929,7 +928,7 @@ export class PerpetualsClient {
     side: PositionSide
   ) => {
     const pos = this.getPositionKey(wallet, poolName, tokenMint, side);
-    console.log("pos:", pos.toBase58())
+    // console.log("pos:", pos.toBase58())
     return await this.program.methods
       .getPnl({})
       .accounts({
@@ -1102,46 +1101,6 @@ export class PerpetualsClient {
       // Create WSOL Token account and not ATA and close it in end 
       if (payTokenSymbol == 'SOL' && createUserWSOLATA) {
         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 Keypair();
         const accCreationLamports = (await getMinimumBalanceForRentExemptAccount(this.provider.connection)); // for account creation
         console.log("accCreationLamports:",accCreationLamports)
@@ -1328,7 +1287,7 @@ export class PerpetualsClient {
         this.programId
       )[0];
 
-      console.log("positionAccount:", positionAccount.toBase58())
+      // console.log("positionAccount:", positionAccount.toBase58())
       const params: any = {
         price: priceAfterSlippage,
       };
@@ -1365,6 +1324,235 @@ export class PerpetualsClient {
     };
   }
 
+
+  // ==== 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
+  openPositionOld = async (
+    payTokenSymbol: string,
+    priceAfterSlippage: BN,
+    collateral: BN,
+    fee : BN,
+    size: BN,
+    side: Side,
+    poolConfig: PoolConfig,
+    createUserWSOLATA = true  // if false will also skip balance checks 
+  ): Promise<TransactionInstruction[]> => {
+
+    console.log("open position :::", payTokenSymbol, poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey.toBase58());
+
+    // const slippageMultiplier = isVariant(side, 'long') ? -1 : 1;
+    // const priceAfterSlippage = price.mul(new BN((100 - (slippagePercentage * slippageMultiplier)) * 100)).div(new BN(100 * 100))
+
+    let publicKey = this.provider.wallet.publicKey;
+    const payTokenCustody = poolConfig.custodies.find(i => i.mintKey.equals(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey))!;
+
+    let userCustodyTokenAccount = await getAssociatedTokenAddress(
+      poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey,
+      publicKey
+    );
+
+    const instructions = [];
+    try {
+
+      if (payTokenSymbol == 'SOL' && createUserWSOLATA) {
+        console.log("payTokenSymbol === sol", payTokenSymbol);
+        const wsolAssociatedTokenAccount = userCustodyTokenAccount;
+        // await getAssociatedTokenAddress(
+        //   NATIVE_MINT,
+        //   publicKey
+        // );
+        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
+            )
+          );
+        }
+
+        const collateralWithfee = collateral.add(fee);
+
+        // 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)
+          );
+        }
+      } else if(createUserWSOLATA == false){
+        console.log("skip WSOL checks and creation ,since createUserWSOLATA == false")
+      } else {
+        // for other tokens check if ATA and balance 
+        if (!(await checkIfAccountExists(userCustodyTokenAccount, this.provider.connection))) {
+          throw "Insufficient Funds , token Account doesn't exist"
+        }
+        const tokenAccountBalance = new BN((await this.provider.connection.getTokenAccountBalance(userCustodyTokenAccount)).value.amount);
+        if (tokenAccountBalance.lt(collateral.add(fee))) {
+          throw "Insufficient Funds"
+        }
+      }
+
+      // replace with getPositionKey()
+      let positionAccount = PublicKey.findProgramAddressSync(
+        [
+          Buffer.from("position"),
+          publicKey.toBuffer(),
+          poolConfig.poolAddress.toBuffer(),
+          payTokenCustody.custodyAccount.toBuffer(),
+          isVariant(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
+        ],
+        this.programId
+      )[0];
+
+      const params: any = {
+        price: priceAfterSlippage,
+        collateral,
+        size,
+        side,
+      };
+
+      let instruction = await 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: SystemProgram.programId,
+          tokenProgram: TOKEN_PROGRAM_ID,
+        }).instruction()
+      instructions.push(instruction);
+
+    } catch (error) {
+      console.log("perpClient openPosition error:", error)
+    }
+    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
+  closePositionOld = async (
+    receivingTokenSymbol: string,
+    priceAfterSlippage: BN,
+    side: Side,
+    poolConfig: PoolConfig
+  ): Promise<TransactionInstruction[]> => {
+
+    console.log("close position :::", receivingTokenSymbol, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey.toBase58());
+
+    // opp during close 
+    // const slippageMultiplier = isVariant(side, 'short') ? -1 : 1;
+    // const priceAfterSlippage = price.mul(new BN((100 - (slippagePercentage * slippageMultiplier)) * 100)).div(new BN(100 * 100))
+
+    let publicKey = this.provider.wallet.publicKey;
+
+    let userReceivingTokenAccount = await getAssociatedTokenAddress(
+      poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey,
+      publicKey
+    );
+    const instructions = [];
+    try {
+
+      if (!(await checkIfAccountExists(userReceivingTokenAccount, this.provider.connection))) {
+        instructions.push(
+          createAssociatedTokenAccountInstruction(
+            publicKey,
+            userReceivingTokenAccount,
+            publicKey,
+            poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey
+          )
+        );
+      }
+
+      const receivingTokenCustody = poolConfig.custodies.find(i => i.mintKey.equals(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey))!;
+
+      // replace with getPositionKey
+      let positionAccount = PublicKey.findProgramAddressSync(
+        [
+          Buffer.from("position"),
+          publicKey.toBuffer(),
+          poolConfig.poolAddress.toBuffer(),
+          receivingTokenCustody.custodyAccount.toBuffer(),
+          isVariant(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
+        ],
+        this.programId
+      )[0];
+
+      console.log("positionAccount:", positionAccount.toBase58())
+      const params: any = {
+        price: priceAfterSlippage,
+      };
+
+      let instruction = await 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: TOKEN_PROGRAM_ID,
+        }).instruction();
+      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') {
+        // await closeAccount()
+        const closeWsolATAIns = createCloseAccountInstruction(userReceivingTokenAccount, publicKey, publicKey);
+        instructions.push(closeWsolATAIns);
+      }
+    } catch (error) {
+      console.error("perpclient closePosition error:", error);
+    }
+
+    return instructions;
+  }
+
+
+
   // TODO: ATA check - else create  - DONE 
   // TODO: handle SOL wrapping to WSOL and create a ATA - DONE
   // TODO : Balance checks - NOT NEEDED
@@ -1504,7 +1692,7 @@ export class PerpetualsClient {
        }
 
     } catch (err) {
-      console.log("perpClient Swap error:: ", err);
+      console.error("perpClient Swap error:: ", err);
       throw err;
     }
 

package/src/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",

package/src/PoolConfig.ts

@@ -4,6 +4,7 @@ import poolConfigs from './PoolConfig.json';
 
 
 export interface CustodyConfig {
+  custodyId: number;
   custodyAccount: PublicKey;
   tokenAccount: PublicKey;
   symbol: string;
@@ -108,9 +109,10 @@ export class PoolConfig {
         mintKey : new PublicKey(i.mintKey)
       }
     })
-    const custodies : CustodyConfig[] = poolConfig['custodies'].map(i => {
+    const custodies : CustodyConfig[] = poolConfig['custodies'].map((i, index) => {
       return {
         ...i,
+        custodyId : i?.custodyId ?? index,
         custodyAccount : new PublicKey(i.custodyAccount),
         tokenAccount : new PublicKey(i.tokenAccount),
         mintKey : new PublicKey(i.mintKey),