flash-sdk 1.0.15 → 1.0.17

package/src/PerpetualsClient.ts

@@ -16,6 +16,7 @@ import {
   SYSVAR_RENT_PUBKEY,
   Commitment,
   LAMPORTS_PER_SOL,
+  Signer,
 } from "@solana/web3.js";
 import {
   getAccount,
@@ -25,6 +26,8 @@ import {
   createSyncNativeInstruction,
   TOKEN_PROGRAM_ID,
   NATIVE_MINT,
+  createInitializeAccount3Instruction,
+  getMinimumBalanceForRentExemptAccount,
 } from "@solana/spl-token";
 
 import { sha256 } from "js-sha256";
@@ -167,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));
   };
 
@@ -211,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)
     );
@@ -404,7 +407,7 @@ export class PerpetualsClient {
     } catch (err) {
       // @ts-ignore
       if (this.printErrors) {
-        console.log(err);
+        console.error("setAdminSigners err:",err);
       }
       throw err;
     }
@@ -462,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
@@ -501,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);
     }
 
 
@@ -518,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
@@ -723,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
@@ -898,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({
@@ -926,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({
@@ -1063,6 +1065,272 @@ export class PerpetualsClient {
   // Create WSOL Token account and not ATA and close it in end 
   // TODO:  close other Accounts - NOT NEEDED
   openPosition = async (
+    payTokenSymbol: string,
+    priceAfterSlippage: BN,
+    collateralWithfee: BN,
+    fee : BN,
+    size: BN,
+    side: Side,
+    poolConfig: PoolConfig,
+    createUserWSOLATA = true,  
+    skipBalanceChecks = false
+  ): Promise< { instructions : TransactionInstruction[] , additionalSigners: Signer[]} > => {
+
+    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
+    );
+
+    let wrappedSolAccount: Keypair | undefined;
+    let preInstructions: TransactionInstruction[] = [];
+    let instructions: TransactionInstruction[] = [];
+    let postInstructions: TransactionInstruction[] = [];
+    const additionalSigners: Signer[] = [];
+
+    try {
+
+      // https://github.com/blockworks-foundation/mango-v4/blob/1ba6513b5ea2b0e557808e712fcf0a811968b45b/ts/client/src/client.ts#L1252 
+      // Create WSOL Token account and not ATA and close it in end 
+      if (payTokenSymbol == 'SOL' && createUserWSOLATA) {
+        console.log("payTokenSymbol === sol", payTokenSymbol);
+        wrappedSolAccount = new Keypair();
+        const accCreationLamports = (await getMinimumBalanceForRentExemptAccount(this.provider.connection)); // for account creation
+        console.log("accCreationLamports:",accCreationLamports)
+        const lamports = collateralWithfee.add(new BN(accCreationLamports)); // for account creation
+
+        preInstructions = [
+          SystemProgram.createAccount({
+            fromPubkey: publicKey,
+            newAccountPubkey: wrappedSolAccount.publicKey,
+            lamports: lamports.toNumber(), //will this break for large amounts ??
+            space: 165,
+            programId: TOKEN_PROGRAM_ID,
+          }),
+          createInitializeAccount3Instruction(
+            wrappedSolAccount.publicKey,
+            NATIVE_MINT,
+            publicKey,
+          ),
+        ];
+        postInstructions = [
+          createCloseAccountInstruction(
+            wrappedSolAccount.publicKey,
+            publicKey,
+            publicKey,
+          ),
+        ];
+        additionalSigners.push(wrappedSolAccount);
+
+      } 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"
+        }
+
+        if(!skipBalanceChecks){
+          const tokenAccountBalance = new BN((await this.provider.connection.getTokenAccountBalance(userCustodyTokenAccount)).value.amount);
+          if (tokenAccountBalance.lt(collateralWithfee)) {
+            throw `Insufficient Funds need more ${collateralWithfee.sub(tokenAccountBalance)} tokens`
+          }
+        }
+       
+      }
+
+      // 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 : collateralWithfee,
+        size,
+        side,
+      };
+
+      let instruction = await this.program.methods
+        .openPosition(params)
+        .accounts({
+          owner: publicKey,
+          fundingAccount: payTokenSymbol == 'SOL' ? wrappedSolAccount.publicKey : userCustodyTokenAccount,
+          transferAuthority: poolConfig.transferAuthority,
+          perpetuals: poolConfig.perpetuals,
+          pool: poolConfig.poolAddress,
+          position: positionAccount,
+          custody: payTokenCustody.custodyAccount,
+          custodyOracleAccount:
+          payTokenCustody.oracleAddress,
+          custodyTokenAccount:
+          payTokenCustody.tokenAccount,
+          systemProgram: SystemProgram.programId,
+          tokenProgram: TOKEN_PROGRAM_ID,
+        }).instruction()
+
+        
+        instructions.push(instruction);
+
+    } catch (error) {
+      console.log("perpClient openPosition error:", error)
+    }
+    return {
+      instructions : [...preInstructions, ...instructions ,...postInstructions],
+      additionalSigners
+    };
+  }
+
+  // TODO: handle SOL wrapping to WSOL and create a ATA - NOT NEEDED
+  // TODO : Balance checks - NOT NEEDED
+  // TODO: ATA check - else create  - DONE 
+  // TODO: for close Accounts - DONE BY ANCHOR
+  // TODO : if out token WSOL -> unwrap to SOL - DONE
+  closePosition = async (
+    receivingTokenSymbol: string,
+    priceAfterSlippage: BN,
+    side: Side,
+    poolConfig: PoolConfig,
+    createUserATA = true,
+    closeUsersWSOLATA = false // to get back WSOL=>SOL
+  ): Promise< { instructions : TransactionInstruction[] , additionalSigners: Signer[]}> => {
+
+    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 : PublicKey;
+    let wrappedSolAccount: Keypair | undefined;
+    let preInstructions: TransactionInstruction[] = [];
+    let instructions: TransactionInstruction[] = [];
+    let postInstructions: TransactionInstruction[] = [];
+    const additionalSigners: Signer[] = [];
+    try {
+
+      if (receivingTokenSymbol == 'SOL') {
+        wrappedSolAccount = new Keypair();
+        userReceivingTokenAccount = wrappedSolAccount.publicKey;
+        const lamports = (await getMinimumBalanceForRentExemptAccount(this.provider.connection)); // for account creation
+
+        preInstructions = [
+          SystemProgram.createAccount({
+            fromPubkey: publicKey,
+            newAccountPubkey: wrappedSolAccount.publicKey,
+            lamports: lamports, //will this break for large amounts ??
+            space: 165,
+            programId: TOKEN_PROGRAM_ID,
+          }),
+          createInitializeAccount3Instruction(
+            wrappedSolAccount.publicKey,
+            NATIVE_MINT,
+            publicKey,
+          ),
+        ];
+        postInstructions = [
+          createCloseAccountInstruction(
+            wrappedSolAccount.publicKey,
+            publicKey,
+            publicKey,
+          ),
+        ];
+        additionalSigners.push(wrappedSolAccount);
+      } else {
+
+        userReceivingTokenAccount = await getAssociatedTokenAddress(
+          poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey,
+          publicKey
+        );
+
+        if (createUserATA && !(await checkIfAccountExists(userReceivingTokenAccount, this.provider.connection))) {
+          preInstructions.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)
+
+      if (receivingTokenSymbol == 'WSOL' && closeUsersWSOLATA) {
+        const closeWsolATAIns = createCloseAccountInstruction(userReceivingTokenAccount, publicKey, publicKey);
+        postInstructions.push(closeWsolATAIns);
+      }
+    } catch (error) {
+      console.error("perpclient closePosition error:", error);
+    }
+
+    return {
+      instructions : [...preInstructions, ...instructions ,...postInstructions],
+      additionalSigners
+    };
+  }
+
+
+  // ==== OLD 
+  // TODO:  handle SOL wrapping to WSOL and create a ATA - DONE
+  // TODO:  Balance checks - DONE
+  // TODO:  ATA check - else create  - DONE 
+  // TODO:  for close Accounts - NOT NEEDED
+  openPositionOld = async (
     payTokenSymbol: string,
     priceAfterSlippage: BN,
     collateral: BN,
@@ -1089,11 +1357,13 @@ export class PerpetualsClient {
     const instructions = [];
     try {
 
-      // https://github.com/blockworks-foundation/mango-v4/blob/1ba6513b5ea2b0e557808e712fcf0a811968b45b/ts/client/src/client.ts#L1252 
-      // Create WSOL Token account and not ATA and close it in end 
       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");
@@ -1192,17 +1462,17 @@ export class PerpetualsClient {
     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
-  closePosition = async (
+  closePositionOld = async (
     receivingTokenSymbol: string,
     priceAfterSlippage: BN,
     side: Side,
-    poolConfig: PoolConfig,
-    closeUsersWSOLATA = false // to get back WSOL=>SOL
+    poolConfig: PoolConfig
   ): Promise<TransactionInstruction[]> => {
 
     console.log("close position :::", receivingTokenSymbol, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey.toBase58());
@@ -1269,7 +1539,7 @@ export class PerpetualsClient {
       instructions.push(instruction)
 
       // SOL is only retrievable by closing the token account and choosing the desired address to send the token account's lamports.
-      if (receivingTokenSymbol == 'SOL' && closeUsersWSOLATA) {
+      if (receivingTokenSymbol == 'SOL') {
         // await closeAccount()
         const closeWsolATAIns = createCloseAccountInstruction(userReceivingTokenAccount, publicKey, publicKey);
         instructions.push(closeWsolATAIns);
@@ -1281,6 +1551,8 @@ export class PerpetualsClient {
     return instructions;
   }
 
+
+
   // TODO: ATA check - else create  - DONE 
   // TODO: handle SOL wrapping to WSOL and create a ATA - DONE
   // TODO : Balance checks - NOT NEEDED
@@ -1420,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.ts

@@ -83,14 +83,14 @@ export class PoolConfig {
   //   return poolConfigs.pools.map(p => this.fromIdsByName(p.poolName, cluster))
   // }
 
-  static getCustodyConfig(custodyAccountPk: Address, poolName: string, cluster: Cluster) {
+  static getCustodyConfig(custodyAccountPk: Address, poolName: string, cluster: Cluster) : CustodyConfig {
     return this.fromIdsByName(poolName, cluster).custodies.find(f => f.custodyAccount.toBase58() === custodyAccountPk.toString())
   }
 
   static getTokensInPool(name: string, cluster: Cluster): Token[] {
     const poolConfig = poolConfigs.pools.find((pool) => pool['poolName'] === name && cluster === pool['cluster']);
     if (!poolConfig) throw new Error(`No pool config ${name} found in Ids!`);
-    const tokens = poolConfig['tokens'].map(i => {
+    const tokens :Token[] = poolConfig['tokens'].map(i => {
       return {
         ...i,
         mintKey: new PublicKey(i.mintKey)
@@ -102,13 +102,13 @@ export class PoolConfig {
   static fromIdsByName(name: string, cluster: Cluster): PoolConfig {
     const poolConfig = poolConfigs.pools.find((pool) => pool['poolName'] === name && cluster === pool['cluster']);
     if (!poolConfig) throw new Error(`No pool config ${name} found in Ids!`);
-    const tokens = poolConfig['tokens'].map(i => {
+    const tokens:Token[] = poolConfig['tokens'].map(i => {
       return {
         ...i,
         mintKey : new PublicKey(i.mintKey)
       }
     })
-    const custodies = poolConfig['custodies'].map(i => {
+    const custodies : CustodyConfig[] = poolConfig['custodies'].map(i => {
       return {
         ...i,
         custodyAccount : new PublicKey(i.custodyAccount),
@@ -139,13 +139,13 @@ export class PoolConfig {
     if (!poolConfig)
       throw new Error(`No pool config ${poolPk.toString()} found in Ids!`);
 
-      const tokens = poolConfig['tokens'].map(i => {
+      const tokens :Token[] = poolConfig['tokens'].map(i => {
         return {
           ...i,
           mintKey : new PublicKey(i.mintKey)
         }
       })
-      const custodies = poolConfig['custodies'].map(i => {
+      const custodies : CustodyConfig[] = poolConfig['custodies'].map(i => {
         return {
           ...i,
           custodyAccount : new PublicKey(i.custodyAccount),