flash-sdk 1.0.4 → 1.0.6

package/src/PoolAccount.ts

@@ -370,19 +370,19 @@ export class PoolAccount implements Pool {
     getAssetsUnderManagementUsd(
         token_prices: OraclePrice[],
         token_ema_prices: OraclePrice[],
-        custodies : CustodyAccount[],
+        custodyAccounts : CustodyAccount[],
         aum_calc_mode: AumCalcMode,
-    ) :BN  {
+        currentTime : BN
+    ) : BN  {
 
         let  pool_amount_usd: BN = BN_ZERO;
         
-        for (let index=0;index<this.custodies.length;index++) {
+        for (let index=0;index<custodyAccounts.length;index++) {
 
-            if( token_prices.length != this.custodies.length || token_prices.length != token_ema_prices.length ){
+            if( token_prices.length != custodyAccounts.length || token_prices.length != token_ema_prices.length ){
                 throw Error("token prices length incorrect");
             }
 
-
             let aum_token_price : OraclePrice;
             //  switch unable to match enum
             if(isVariant(aum_calc_mode,"last")){
@@ -404,36 +404,38 @@ export class PoolAccount implements Pool {
             }
 
             let token_amount_usd :BN =
-                aum_token_price.getAssetAmountUsd(custodies[index].assets.owned, custodies[index].decimals);
+                aum_token_price.getAssetAmountUsd(custodyAccounts[index].assets.owned, custodyAccounts[index].decimals);
 
             pool_amount_usd = pool_amount_usd.add(token_amount_usd);
 
-            // if (custodies[index].pricing.useUnrealizedPnlInAum) {
-            //     // compute aggregate unrealized pnl
-            //     let (long_profit, long_loss, _) = this.getPnlUsd(
-            //         &custodies[index].get_collective_position(Side::Long)?,
-            //         &token_price,
-            //         &token_ema_price,
-            //         &custodies[index],
-            //         curtime,
-            //         false,
-            //     )?;
-            //     let (short_profit, short_loss, _) = self.get_pnl_usd(
-            //         &custodies[index].get_collective_position(Side::Short)?,
-            //         &token_price,
-            //         &token_ema_price,
-            //         &custodies[index],
-            //         curtime,
-            //         false,
-            //     )?;
-
-            //     // adjust pool amount by collective profit/loss
-            //     pool_amount_usd = math::checked_add(pool_amount_usd, long_profit as u128)?;
-            //     pool_amount_usd = math::checked_add(pool_amount_usd, short_profit as u128)?;
-            //     pool_amount_usd = pool_amount_usd.saturating_sub(long_loss as u128);
-            //     pool_amount_usd = pool_amount_usd.saturating_sub(short_loss as u128);
-            // }
-            throw Error("Incomplete")
+            if (custodyAccounts[index].pricing.useUnrealizedPnlInAum) {
+                // compute aggregate unrealized pnl
+                // console.log("long_pos:",custodyAccounts[index].longPositions)
+                let {  profit : long_profit , loss : long_loss  } = this.getPnlUsd(
+                    custodyAccounts[index].getCollectivePosition(Side.Long),
+                    token_prices[index],
+                    token_ema_prices[index],
+                    custodyAccounts[index],
+                    currentTime,
+                    false,
+                );
+                // console.log("long_pos:",custodyAccounts[index].shortPositions)
+
+                let {  profit : short_profit , loss : short_loss  } =  this.getPnlUsd(
+                    custodyAccounts[index].getCollectivePosition(Side.Short),
+                    token_prices[index],
+                    token_ema_prices[index],
+                    custodyAccounts[index],
+                    currentTime,
+                    false,
+                );
+
+                // adjust pool amount by collective profit/loss
+                pool_amount_usd = pool_amount_usd.add(long_profit);
+                pool_amount_usd = pool_amount_usd.add(short_profit); 
+                pool_amount_usd = pool_amount_usd.sub(long_loss); // check overflow - saturating_sub
+                pool_amount_usd = pool_amount_usd.sub(short_loss);
+            }
         }
 
         return pool_amount_usd;

package/src/PoolConfig.json

@@ -221,6 +221,8 @@
       "lpTokenMint": "Han23mxQeHeoBbj4vYtYZNaB5bhwV3n4nxKezM6H6nbr",
       "lpDecimals": 6,
       "perpetuals": "5CpxhcrfvH8s9QDT2nMaPWqPoMwpuiPuP8e8x4YN61A2",
+      "transferAuthority" : "",
+      "multisig" : "",
       "tokens": [
         {
           "symbol": "USDC",
@@ -266,6 +268,8 @@
       "lpTokenMint": "J1887XKSeZFRzD6ACyiWMurXZd8xtNyb1Edj2oAxKT9E",
       "lpDecimals": 6,
       "perpetuals": "5CpxhcrfvH8s9QDT2nMaPWqPoMwpuiPuP8e8x4YN61A2",
+      "transferAuthority" : "",
+      "multisig" : "",
       "tokens": [
         {
           "symbol": "Test",

package/src/PoolConfig.ts

@@ -1,4 +1,4 @@
-import { Address } from '@project-serum/anchor';
+import { Address } from '@coral-xyz/anchor';
 import { Cluster, PublicKey } from '@solana/web3.js';
 import poolConfigs from './PoolConfig.json';
 
@@ -29,11 +29,8 @@ export class PoolConfig {
     public lpTokenMint: PublicKey,
     public lpDecimals: number,
     public perpetuals: PublicKey,
-
-
-    // public perpMarketAccountKey: string,
-    // public multisigAccountKey: string,
-    // public transferAuthorityAccountKey: string,
+    public transferAuthority: PublicKey,
+    public multisig: PublicKey,
 
     public tokens: Token[],
 
@@ -68,6 +65,20 @@ export class PoolConfig {
     );
   }
 
+
+  public getTokenFromSymbol = (symbol: string) : Token => {
+    return this.tokens.find(f => f.symbol.toUpperCase() === symbol.toUpperCase())!;
+  }
+
+  public getTokenFromMintString = (mint: string) : Token => {
+      return this.tokens.find(f => f.mintKey.toBase58() === mint)!;
+  }
+
+  public getTokenFromMintPk = (mint: PublicKey) : Token => {
+      return this.tokens.find(f => f.mintKey.equals(mint))!;
+  }
+
+
   // static getAllPoolConfigs(cluster: Cluster): PoolConfig[] {
   //   return poolConfigs.pools.map(p => this.fromIdsByName(p.poolName, cluster))
   // }
@@ -114,6 +125,8 @@ export class PoolConfig {
       new PublicKey(poolConfig.lpTokenMint),
       poolConfig.lpDecimals,
       new PublicKey(poolConfig.perpetuals),
+      new PublicKey(poolConfig.transferAuthority),
+      new PublicKey(poolConfig.multisig),
       tokens,
       custodies,
     );
@@ -150,6 +163,8 @@ export class PoolConfig {
       new PublicKey(poolConfig.lpTokenMint),
       poolConfig.lpDecimals,
       new PublicKey(poolConfig.perpetuals),
+      new PublicKey(poolConfig.transferAuthority),
+      new PublicKey(poolConfig.multisig),
       tokens,
       custodies,
     );

package/src/{PoolDisplayData.ts → PoolDataClient.ts}

@@ -11,7 +11,7 @@ import { checkedCeilDiv, checkedDecimalCeilMul, checkedDecimalMul, scaleToExpone
 import { PoolConfig } from "./PoolConfig";
 import { PoolAccount } from "./PoolAccount";
 
-export class PoolDisplayData {
+export class PoolDataClient {
 
   public poolConfig: PoolConfig;
   public pool: PoolAccount;
@@ -35,7 +35,7 @@ export class PoolDisplayData {
     this.pool = pool
   }
 
-  loadlpData(lpTokenInfo: Mint) {
+  loadLpData(lpTokenInfo: Mint) {
     this.lpTokenInfo = lpTokenInfo
   }
 

package/src/Token.ts

@@ -0,0 +1 @@
+// later inport from UI

package/src/{target/types → idl}/perpetuals.ts

@@ -3368,7 +3368,7 @@ export type Perpetuals = {
       "name": "OpenPositionLog",
       "fields": [
         {
-          "name": "postion",
+          "name": "positionPubKey",
           "type": "publicKey",
           "index": false
         },
@@ -3377,32 +3377,169 @@ export type Perpetuals = {
           "type": "publicKey",
           "index": false
         },
+        {
+          "name": "pool",
+          "type": "publicKey",
+          "index": false
+        },
         {
           "name": "custody",
           "type": "publicKey",
           "index": false
         },
+        {
+          "name": "openTime",
+          "type": "i64",
+          "index": false
+        },
+        {
+          "name": "updateTime",
+          "type": "i64",
+          "index": false
+        },
+        {
+          "name": "side",
+          "type": {
+            "defined": "Side"
+          },
+          "index": false
+        },
         {
           "name": "price",
           "type": "u64",
           "index": false
         },
         {
-          "name": "collateral",
+          "name": "sizeUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "collateralUsd",
           "type": "u64",
           "index": false
         },
         {
-          "name": "size",
+          "name": "unrealizedProfitUsd",
           "type": "u64",
           "index": false
         },
+        {
+          "name": "unrealizedLossUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "cumulativeInterestSnapshot",
+          "type": "u128",
+          "index": false
+        },
+        {
+          "name": "lockedAmount",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "collateralAmount",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "ClosePositionLog",
+      "fields": [
+        {
+          "name": "positionPubKey",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "pool",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "custody",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "openTime",
+          "type": "i64",
+          "index": false
+        },
+        {
+          "name": "updateTime",
+          "type": "i64",
+          "index": false
+        },
         {
           "name": "side",
           "type": {
             "defined": "Side"
           },
           "index": false
+        },
+        {
+          "name": "price",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "sizeUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "collateralUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "unrealizedProfitUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "unrealizedLossUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "cumulativeInterestSnapshot",
+          "type": "u128",
+          "index": false
+        },
+        {
+          "name": "lockedAmount",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "collateralAmount",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "profitUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "lossUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "feeAmount",
+          "type": "u64",
+          "index": false
         }
       ]
     }
@@ -6906,7 +7043,7 @@ export const IDL: Perpetuals = {
       "name": "OpenPositionLog",
       "fields": [
         {
-          "name": "postion",
+          "name": "positionPubKey",
           "type": "publicKey",
           "index": false
         },
@@ -6915,32 +7052,169 @@ export const IDL: Perpetuals = {
           "type": "publicKey",
           "index": false
         },
+        {
+          "name": "pool",
+          "type": "publicKey",
+          "index": false
+        },
         {
           "name": "custody",
           "type": "publicKey",
           "index": false
         },
+        {
+          "name": "openTime",
+          "type": "i64",
+          "index": false
+        },
+        {
+          "name": "updateTime",
+          "type": "i64",
+          "index": false
+        },
+        {
+          "name": "side",
+          "type": {
+            "defined": "Side"
+          },
+          "index": false
+        },
         {
           "name": "price",
           "type": "u64",
           "index": false
         },
         {
-          "name": "collateral",
+          "name": "sizeUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "collateralUsd",
           "type": "u64",
           "index": false
         },
         {
-          "name": "size",
+          "name": "unrealizedProfitUsd",
           "type": "u64",
           "index": false
         },
+        {
+          "name": "unrealizedLossUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "cumulativeInterestSnapshot",
+          "type": "u128",
+          "index": false
+        },
+        {
+          "name": "lockedAmount",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "collateralAmount",
+          "type": "u64",
+          "index": false
+        }
+      ]
+    },
+    {
+      "name": "ClosePositionLog",
+      "fields": [
+        {
+          "name": "positionPubKey",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "owner",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "pool",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "custody",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "openTime",
+          "type": "i64",
+          "index": false
+        },
+        {
+          "name": "updateTime",
+          "type": "i64",
+          "index": false
+        },
         {
           "name": "side",
           "type": {
             "defined": "Side"
           },
           "index": false
+        },
+        {
+          "name": "price",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "sizeUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "collateralUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "unrealizedProfitUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "unrealizedLossUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "cumulativeInterestSnapshot",
+          "type": "u128",
+          "index": false
+        },
+        {
+          "name": "lockedAmount",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "collateralAmount",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "profitUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "lossUsd",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "feeAmount",
+          "type": "u64",
+          "index": false
         }
       ]
     }

package/src/index.ts

@@ -7,6 +7,9 @@ export * from './types';
 export * from './utils';
 export * from './PerpetualsClient';
 export * from './PoolConfig';
+export * from './PoolDataClient';
+export {IDL}  from './idl/perpetuals';
+export * from './utils/rpc';
 // export { default as PoolConfigJson } from "./PoolConfig.json";
 
 

package/src/types/index.ts

@@ -1,6 +1,7 @@
-import { BN } from "@project-serum/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { OraclePrice } from "../OraclePrice";
+import { BN_ZERO } from "../constants";
+import { BN } from "@coral-xyz/anchor";
 
 export type PositionSide = "long" | "short";
 
@@ -61,6 +62,28 @@ export interface Position {
     bump: number
 }
 
+export const DEFAULT_POSITION : Position = {
+    owner: PublicKey.default,
+    pool: PublicKey.default,
+    custody: PublicKey.default,
+    // lockCustody: PublicKey.default,
+
+    openTime: BN_ZERO,
+    updateTime: BN_ZERO,
+
+    side: Side.Long,
+    price: BN_ZERO,
+    sizeUsd: BN_ZERO,
+    collateralUsd: BN_ZERO,
+    unrealizedProfitUsd: BN_ZERO,
+    unrealizedLossUsd: BN_ZERO,
+    cumulativeInterestSnapshot: BN_ZERO,
+    lockedAmount: BN_ZERO,
+    collateralAmount: BN_ZERO,
+
+    bump: 0
+}
+
 // =======================================================
 // ==================    POOL     ========================
 // =======================================================
@@ -132,8 +155,8 @@ export interface PositionStats {
     collateralUsd: BN,
     sizeUsd: BN,
     lockedAmount: BN,
-    weightedLeverage: BN, // weighted_price
-    totalLeverage: BN, // total_quantity
+    weightedPrice: BN, 
+    totalQuantity: BN, 
     cumulativeInterestUsd: BN,
     cumulativeInterestSnapshot: BN,
 }

package/src/utils/index.ts

@@ -1,5 +1,6 @@
 import BN from "bn.js";
 import { BN_ONE, BN_ZERO } from "../constants";
+import { Connection, PublicKey } from "@solana/web3.js";
 
 export const getUnixTs = () => {
     return new Date().getTime() / 1000;
@@ -57,6 +58,19 @@ export function toUiDecimals(
 
 }
 
+export async function checkIfAccountExists(
+  account: PublicKey,
+  connection: Connection
+): Promise<boolean> {
+  // console.log("connection print", connection);
+  let bal = await connection.getBalance(account);
+  if (bal > 0) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
   // recheck ?? logic 
 export const scaleToExponent = (arg: BN, exponent: BN, target_exponent: BN) : BN => {
     if (target_exponent.eq(exponent)) {