flash-sdk 1.0.1 → 1.0.3

package/lib/CustodyAccount.d.ts

@@ -1,8 +1,8 @@
 import { PublicKey } from "@solana/web3.js";
-import { Assets, FeesStats, Custody, Fees, PricingParams, TradeStats, Permissions, BorrowRateParams, OracleParams, VolumeStats, PositionStats, BorrowRateState } from "./types";
+import { Assets, FeesStats, Custody, Fees, PricingParams, TradeStats, Permissions, BorrowRateParams, OracleParams, VolumeStats, PositionStats, BorrowRateState, Side } from "./types";
 import { PositionAccount } from "./PositionAccount";
 import BN from "bn.js";
-export declare class CustodyAccount {
+export declare class CustodyAccount implements Custody {
     publicKey: PublicKey;
     pool: PublicKey;
     mint: PublicKey;
@@ -21,9 +21,12 @@ export declare class CustodyAccount {
     longPositions: PositionStats;
     shortPositions: PositionStats;
     borrowRateState: BorrowRateState;
+    bump: number;
+    tokenAccountBump: number;
     constructor(publicKey: PublicKey, parseData: Custody);
     static from(publicKey: PublicKey, parseData: Custody): CustodyAccount;
     updateCustodyData(custody: Custody): void;
     getCumulativeInterest(curtime: BN): BN;
     getInterestAmountUsd(position: PositionAccount, curtime: BN): BN;
+    getCollectivePosition(side: Side): PositionAccount;
 }

package/lib/CustodyAccount.js

@@ -15,6 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustodyAccount = void 0;
+var types_1 = require("./types");
 var bn_js_1 = __importDefault(require("bn.js"));
 var constants_1 = require("./constants");
 var utils_1 = require("./utils");
@@ -59,6 +60,35 @@ var CustodyAccount = /** @class */ (function () {
         return (position_interest.mul(position.sizeUsd))
             .div(new bn_js_1.default(constants_1.RATE_POWER));
     };
+    CustodyAccount.prototype.getCollectivePosition = function (side) {
+        var stats;
+        if ((0, types_1.isVariant)(side, 'long')) {
+            stats = this.longPositions;
+        }
+        else {
+            stats = this.shortPositions;
+        }
+        ;
+        // if (!stats.openPositions.isNeg()) {
+        //     const obj: Position =  {
+        //       side,
+        //       price: 
+        //           stats.weighted_price.div(stats.total_quantity)
+        //       size_usd: stats.size_usd,
+        //       collateral_usd: stats.collateral_usd,
+        //       unrealized_loss_usd: stats.cumulative_interest_usd,
+        //       cumulative_interest_snapshot: stats.cumulative_interest_snapshot,
+        //       locked_amount: stats.locked_amount,
+        //       ..Position::default()
+        //     }
+        //     return new PositionAccount(
+        //       new PublicKey('dgfgfg'),
+        //     )
+        // } else {
+        //     Ok(Position::default())
+        // }
+        throw Error("Incomplete");
+    };
     return CustodyAccount;
 }());
 exports.CustodyAccount = CustodyAccount;

package/lib/OraclePrice.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 export declare class OraclePrice {
     price: BN;

package/lib/PerpetualsClient.d.ts

@@ -1,5 +1,5 @@
 import { Program, AnchorProvider, BN } from "@coral-xyz/anchor";
-import { PublicKey, Keypair } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
 import { PoolAccount } from "./PoolAccount";
 import { BorrowRateParams, Fees, OracleParams, Permissions, Position, PositionSide, PricingParams, TokenRatios } from "./types";
 import { OraclePrice } from "./OraclePrice";
@@ -8,7 +8,8 @@ import { Perpetuals } from "./target/types/perpetuals";
 export declare class PerpetualsClient {
     provider: AnchorProvider;
     program: Program<Perpetuals>;
-    admin: Keypair;
+    admin: PublicKey;
+    programId: PublicKey;
     multisig: {
         publicKey: PublicKey;
         bump: number;
@@ -21,7 +22,7 @@ export declare class PerpetualsClient {
         publicKey: PublicKey;
         bump: number;
     };
-    constructor(clusterUrl: string, adminKey: string);
+    constructor(provider: AnchorProvider, programId: PublicKey);
     findProgramAddress: (label: string, extraSeeds?: any) => {
         publicKey: PublicKey;
         bump: number;

package/lib/PerpetualsClient.js

@@ -42,11 +42,31 @@ var web3_js_1 = require("@solana/web3.js");
 var spl_token_1 = require("@solana/spl-token");
 var js_sha256_1 = require("js-sha256");
 var bs58_1 = require("bs58");
-var fs_1 = require("fs");
 var PositionAccount_1 = require("./PositionAccount");
-// import { Perpetuals } from "../../target/types/perpetuals"
+var perpetuals_1 = require("./target/types/perpetuals");
+/* USEAGE
+
+UI ---
+provider = from phatom
+
+client = new PerpetualsClient(provider, user.pubkey , programId);
+
+BOT cli --------
+
+provider = await getProvider(new DefaultWallet(DEFAULT_PERPS_USER));
+
+AnchorProvider.local(clusterUrl, {
+       commitment: "confirmed",
+      preflightCommitment: "confirmed",
+       skipPreflight: true
+   });
+process.env["ANCHOR_WALLET"] = adminKeyPath;
+
+client = new PerpetualsClient(provider, DEFAULT_PERPS_USER.pubkey , programId);
+
+*/
 var PerpetualsClient = /** @class */ (function () {
-    function PerpetualsClient(clusterUrl, adminKey) {
+    function PerpetualsClient(provider, programId) {
         var _this = this;
         this.findProgramAddress = function (label, extraSeeds) {
             if (extraSeeds === void 0) { extraSeeds = null; }
@@ -335,11 +355,11 @@ var PerpetualsClient = /** @class */ (function () {
                                 minSignatures: minSignatures,
                             })
                                 .accounts({
-                                admin: this.admin.publicKey,
+                                admin: this.admin,
                                 multisig: this.multisig.publicKey,
                             })
                                 .remainingAccounts(adminMetas)
-                                .signers([this.admin])
+                                // .signers([this.admin])
                                 .rpc()];
                     case 2:
                         _a.sent();
@@ -361,7 +381,7 @@ var PerpetualsClient = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.program.methods
                             .addPool({ name: name })
                             .accounts({
-                            admin: this.admin.publicKey,
+                            admin: this.provider.wallet.publicKey,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
                             perpetuals: this.perpetuals.publicKey,
@@ -371,7 +391,7 @@ var PerpetualsClient = /** @class */ (function () {
                             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                             rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                         })
-                            .signers([this.admin])
+                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -389,14 +409,14 @@ var PerpetualsClient = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.program.methods
                             .removePool({})
                             .accounts({
-                            admin: this.admin.publicKey,
+                            admin: this.admin,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
                             perpetuals: this.perpetuals.publicKey,
                             pool: this.getPoolKey(name),
                             systemProgram: web3_js_1.SystemProgram.programId,
                         })
-                            .signers([this.admin])
+                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -430,7 +450,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 ratios: ratios,
                             })
                                 .accounts({
-                                admin: this.admin.publicKey,
+                                admin: this.admin,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -442,7 +462,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                             })
-                                .signers([this.admin])
+                                // .signers([this.admin])
                                 .rpc()
                                 .catch(function (err) {
                                 console.error(err);
@@ -479,7 +499,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 ratios: ratios,
                             })
                                 .accounts({
-                                admin: this.admin.publicKey,
+                                admin: this.admin,
                                 multisig: this.multisig.publicKey,
                                 transferAuthority: this.authority.publicKey,
                                 perpetuals: this.perpetuals.publicKey,
@@ -491,7 +511,7 @@ var PerpetualsClient = /** @class */ (function () {
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                             })
-                                .signers([this.admin])
+                                // .signers([this.admin])
                                 .rpc()
                                 .catch(function (err) {
                                 console.error(err);
@@ -510,7 +530,7 @@ var PerpetualsClient = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.program.methods
                             .removeCustody({ ratios: ratios })
                             .accounts({
-                            admin: this.admin.publicKey,
+                            admin: this.admin,
                             multisig: this.multisig.publicKey,
                             transferAuthority: this.authority.publicKey,
                             perpetuals: this.perpetuals.publicKey,
@@ -520,7 +540,7 @@ var PerpetualsClient = /** @class */ (function () {
                             systemProgram: web3_js_1.SystemProgram.programId,
                             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                         })
-                            .signers([this.admin])
+                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -538,13 +558,13 @@ var PerpetualsClient = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.program.methods
                             .upgradeCustody({})
                             .accounts({
-                            admin: this.admin.publicKey,
+                            admin: this.admin,
                             multisig: this.multisig.publicKey,
                             pool: this.getPoolKey(poolName),
                             custody: this.getCustodyKey(poolName, tokenMint),
                             systemProgram: web3_js_1.SystemProgram.programId,
                         })
-                            .signers([this.admin])
+                            // .signers([this.admin])
                             .rpc()
                             .catch(function (err) {
                             console.error(err);
@@ -993,14 +1013,25 @@ var PerpetualsClient = /** @class */ (function () {
                 }
             });
         }); };
-        this.provider = anchor_1.AnchorProvider.local(clusterUrl, {
-            commitment: "confirmed",
-            preflightCommitment: "confirmed",
-            skipPreflight: true
-        });
-        (0, anchor_1.setProvider)(this.provider);
-        this.program = anchor_1.workspace.Perpetuals;
-        this.admin = web3_js_1.Keypair.fromSecretKey(new Uint8Array(JSON.parse((0, fs_1.readFileSync)(adminKey).toString())));
+        // 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.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");

package/lib/PoolAccount.d.ts

@@ -1,11 +1,10 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
-import { Pool, Side, TokenRatios } from "./types";
+import { AumCalcMode, Pool, Side, TokenRatios } from "./types";
 import { PublicKey } from "@solana/web3.js";
 import { CustodyAccount } from "./CustodyAccount";
 import { OraclePrice } from "./OraclePrice";
 import { PositionAccount } from "./PositionAccount";
-export declare class PoolAccount {
+export declare class PoolAccount implements Pool {
     publicKey: PublicKey;
     name: string;
     custodies: PublicKey[];
@@ -31,4 +30,5 @@ export declare class PoolAccount {
         loss: BN;
         exitFee: BN;
     };
+    getAssetsUnderManagementUsd(token_prices: OraclePrice[], token_ema_prices: OraclePrice[], custodies: CustodyAccount[], aum_calc_mode: AumCalcMode): BN;
 }

package/lib/PoolAccount.js

@@ -20,9 +20,6 @@ var PoolAccount = /** @class */ (function () {
     PoolAccount.prototype.getTokenId = function (custodyKey) {
         return this.custodies.findIndex(function (i) { return i.toBase58() == custodyKey.toBase58(); });
     };
-    //   loadlpData(lpTokenInfo : Mint){
-    //     this.lpTokenInfo = lpTokenInfo
-    //   }
     PoolAccount.prototype.getAddLiquidityFee = function (tokenId, amount, custody, tokenPrice) {
         return this.getFee(tokenId, custody.fees.addLiquidity, amount, new anchor_1.BN(0), custody, tokenPrice);
     };
@@ -243,6 +240,66 @@ var PoolAccount = /** @class */ (function () {
             }
         }
     }; //getPnlUsd
+    PoolAccount.prototype.getAssetsUnderManagementUsd = function (token_prices, token_ema_prices, custodies, aum_calc_mode) {
+        var pool_amount_usd = constants_1.BN_ZERO;
+        for (var index = 0; index < this.custodies.length; index++) {
+            if (token_prices.length != this.custodies.length || token_prices.length != token_ema_prices.length) {
+                throw Error("token prices length incorrect");
+            }
+            var aum_token_price = void 0;
+            //  switch unable to match enum
+            if ((0, types_1.isVariant)(aum_calc_mode, "last")) {
+                aum_token_price = token_prices[index];
+            }
+            else if ((0, types_1.isVariant)(aum_calc_mode, "ema")) {
+                aum_token_price = token_ema_prices[index];
+            }
+            else if ((0, types_1.isVariant)(aum_calc_mode, "min")) {
+                if (token_prices[index].cmp(token_ema_prices[index])) {
+                    aum_token_price = token_prices[index];
+                }
+                else {
+                    aum_token_price = token_ema_prices[index];
+                }
+            }
+            else if ((0, types_1.isVariant)(aum_calc_mode, "max")) {
+                if (token_ema_prices[index].cmp(token_prices[index])) {
+                    aum_token_price = token_prices[index];
+                }
+                else {
+                    aum_token_price = token_ema_prices[index];
+                }
+            }
+            var token_amount_usd = aum_token_price.getAssetAmountUsd(custodies[index].assets.owned, custodies[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");
+        }
+        return pool_amount_usd;
+    };
     return PoolAccount;
 }()); // Pool
 exports.PoolAccount = PoolAccount;

package/lib/PoolDisplayData.d.ts

@@ -1,13 +1,33 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { Mint } from "@solana/spl-token";
-import { Pool } from "./types";
 import { CustodyAccount } from "./CustodyAccount";
 import { PoolConfig } from "./PoolConfig";
+import { PoolAccount } from "./PoolAccount";
 export declare class PoolDisplayData {
     poolConfig: PoolConfig;
-    poolData: Pool;
+    pool: PoolAccount;
     lpTokenInfo: Mint;
     custodies: CustodyAccount[];
     totalPoolValueUsd: BN;
+    constructor(poolConfig: PoolConfig, pool: PoolAccount, lpTokenInfo: Mint, custodies: CustodyAccount[]);
+    loadCustodies(custodies: CustodyAccount[]): void;
+    loadPoolData(pool: PoolAccount): void;
+    loadlpData(lpTokenInfo: Mint): void;
+    getLpStats(prices: any): {
+        lpTokenSupply: BN;
+        decimals: number;
+        totalPoolValue: BN;
+        price: BN;
+        stableCoinPercentage: BN;
+        marketCap: BN;
+    };
+    getOiLongUI(): BN;
+    getOiShortUI(): BN;
+    getCustodyDetails(prices: any): any[];
+    getPoolStats(): {
+        totalFees: BN;
+        totalVolume: BN;
+        currentLongPositionsUsd: BN;
+        currentShortPositionsUsd: BN;
+    };
 }

package/lib/PoolDisplayData.js

@@ -1,9 +1,152 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PoolDisplayData = void 0;
+var constants_1 = require("./constants");
+var anchor_1 = require("@coral-xyz/anchor");
+var utils_1 = require("./utils");
 var PoolDisplayData = /** @class */ (function () {
-    function PoolDisplayData() {
+    function PoolDisplayData(poolConfig, pool, lpTokenInfo, custodies) {
+        this.poolConfig = poolConfig;
+        this.pool = pool;
+        this.lpTokenInfo = lpTokenInfo;
+        this.custodies = custodies;
+        this.totalPoolValueUsd = new anchor_1.BN(-1); // -1 meaning unset
     }
+    PoolDisplayData.prototype.loadCustodies = function (custodies) {
+        this.custodies = custodies;
+    };
+    PoolDisplayData.prototype.loadPoolData = function (pool) {
+        this.pool = pool;
+    };
+    PoolDisplayData.prototype.loadlpData = function (lpTokenInfo) {
+        this.lpTokenInfo = lpTokenInfo;
+    };
+    // TODO :: replace this with PoolAccount.getAssetsUnderManagementUsd() 
+    // should take pnl's into account 
+    PoolDisplayData.prototype.getLpStats = function (prices) {
+        var stableCoinAmount = new anchor_1.BN(0);
+        var totalPoolValueUsd = new anchor_1.BN(0);
+        var _loop_1 = function (custody) {
+            var custodyData = this_1.custodies.find(function (t) { return t.mint.toBase58() === custody.mintKey.toBase58(); });
+            if (custodyData) {
+                if (custodyData.isStable) {
+                    stableCoinAmount = stableCoinAmount.add(custodyData.assets.owned);
+                }
+                var priceBN = new anchor_1.BN(prices.get(custody.symbol) * Math.pow(10, constants_1.PRICE_DECIMALS)); // so always keep prices with 6 decimals 
+                var custodyValue = priceBN.mul(custodyData.assets.owned).div(new anchor_1.BN(Math.pow(10, custody.decimals)));
+                totalPoolValueUsd = totalPoolValueUsd.add(custodyValue);
+            }
+        };
+        var this_1 = this;
+        for (var _i = 0, _a = this.poolConfig.custodies; _i < _a.length; _i++) {
+            var custody = _a[_i];
+            _loop_1(custody);
+        }
+        // console.log("totalPoolValueUsd.toNumber():",totalPoolValueUsd.toString())
+        // console.log("stableCoinAmount.toNumber():",stableCoinAmount.toString())
+        // if(this.lpTokenInfo.supply.toString() =='0' || totalPoolValueUsd.toString()=='0'){
+        //   console.error("supply or amt cannot be zero")
+        //   throw "supply or amt cannot be zero";
+        // }
+        this.totalPoolValueUsd = totalPoolValueUsd;
+        var lpPrice = totalPoolValueUsd.div(new anchor_1.BN(this.lpTokenInfo.supply.toString() === '0' ? 1 : this.lpTokenInfo.supply.toString()));
+        return {
+            lpTokenSupply: new anchor_1.BN(this.lpTokenInfo.supply.toString()),
+            decimals: this.poolConfig.lpDecimals,
+            totalPoolValue: totalPoolValueUsd,
+            price: lpPrice,
+            stableCoinPercentage: totalPoolValueUsd.toNumber() != 0 ? stableCoinAmount.mul(new anchor_1.BN(constants_1.PERCENTAGE_DECIMALS)).div(totalPoolValueUsd) : new anchor_1.BN(1),
+            marketCap: lpPrice.mul(new anchor_1.BN(this.lpTokenInfo.supply.toString())),
+            // totalStaked : BN,
+        };
+    };
+    PoolDisplayData.prototype.getOiLongUI = function () {
+        var totalAmount = new anchor_1.BN('0');
+        this.custodies.forEach(function (i) {
+            totalAmount = totalAmount.add(i.tradeStats.oiLongUsd);
+        });
+        return totalAmount;
+    };
+    PoolDisplayData.prototype.getOiShortUI = function () {
+        var totalAmount = new anchor_1.BN('0');
+        this.custodies.forEach(function (i) {
+            totalAmount = totalAmount.add(i.tradeStats.oiShortUsd);
+        });
+        return totalAmount;
+    };
+    // handle decimal and this should accept a list of prices probs map or object
+    PoolDisplayData.prototype.getCustodyDetails = function (prices) {
+        var custodyDetails = [];
+        var _loop_2 = function (i) {
+            var custody = this_2.poolConfig.custodies[i];
+            if (!custody)
+                return "continue";
+            // console.log('this.pool :>> ', this.pool);
+            // const token = this.pool.tokens.find(t => t.custody.toBase58() === custody.custodyAccount.toBase58());
+            var tokenRatio = this_2.pool.ratios[i];
+            var custodyData = this_2.custodies.find(function (t) { return t.mint.toBase58() === custody.mintKey.toBase58(); });
+            var priceBN = new anchor_1.BN(prices.get(custody.symbol) * Math.pow(10, 6)); // so always keep prices with 6 decimals 
+            if (this_2.totalPoolValueUsd.toString() == "-1") {
+                console.error("call getLpStats first");
+                throw "call getLpStats first";
+            }
+            // if(this.totalPoolValueUsd.toString()=='0'){
+            //   console.error("call getLpStats first , totalPoolValueUsd ZERO")
+            //   return defaultData.custodyDetails;
+            // } 
+            // console.log("this.totalPoolValueUsd:",this.totalPoolValueUsd.toString())
+            if (custodyData && tokenRatio) {
+                custodyDetails.push({
+                    symbol: custody.symbol,
+                    price: new anchor_1.BN(prices.get(custody.symbol)),
+                    targetWeight: tokenRatio.target,
+                    currentWeight: this_2.totalPoolValueUsd.toNumber() ?
+                        (custodyData.assets.owned.mul(priceBN)).mul(new anchor_1.BN(Math.pow(10, constants_1.PERCENTAGE_DECIMALS))).div(this_2.totalPoolValueUsd).div(new anchor_1.BN(Math.pow(10, custody.decimals)))
+                        : new anchor_1.BN(0),
+                    utilization: custodyData.assets.owned.toNumber() ?
+                        (0, utils_1.toUiDecimals)(custodyData.assets.locked.mul(new anchor_1.BN(Math.pow(10, constants_1.PERCENTAGE_DECIMALS))).div(custodyData.assets.owned), constants_1.PERCENTAGE_DECIMALS, 2)
+                        : '0',
+                    // assetsAmountUi : (custodyData.assets.owned.toNumber() / 10**(custody.decimals)).toFixed(4),
+                    assetsAmountUi: (0, utils_1.toUiDecimals)(custodyData.assets.owned, custody.decimals, 4, true),
+                    // totalUsdAmountUi : ((custodyData.assets.owned.mul(priceBN)).div(new BN(10**(custody.decimals))).toNumber() / 10**6).toFixed(4),
+                    totalUsdAmountUi: (0, utils_1.toUiDecimals)((custodyData.assets.owned.mul(priceBN)), custody.decimals + constants_1.PRICE_DECIMALS, 2, true),
+                });
+            }
+        };
+        var this_2 = this;
+        for (var i = 0; i < this.poolConfig.custodies.length; i++) {
+            _loop_2(i);
+        }
+        return custodyDetails;
+    };
+    PoolDisplayData.prototype.getPoolStats = function () {
+        var totalFees = new anchor_1.BN(0);
+        var totalVolume = new anchor_1.BN(0);
+        var currentLongPositionsUsd = new anchor_1.BN(0);
+        var currentShortPositionsUsd = new anchor_1.BN(0);
+        var _loop_3 = function (custody) {
+            var custodyData = this_3.custodies.find(function (t) { return t.mint.toBase58() === custody.mintKey.toBase58(); });
+            if (custodyData) {
+                var custodyFeeTotal = Object.values(custodyData.collectedFees).reduce(function (a, b) { return a.add(b); }, new anchor_1.BN(0));
+                totalFees = totalFees.add(custodyFeeTotal);
+                var custodyVolume = Object.values(custodyData.volumeStats).reduce(function (a, b) { return a.add(b); }, new anchor_1.BN(0));
+                totalVolume = totalVolume.add(custodyVolume);
+                currentLongPositionsUsd = currentLongPositionsUsd.add(custodyData.tradeStats.oiLongUsd);
+                currentShortPositionsUsd = currentShortPositionsUsd.add(custodyData.tradeStats.oiShortUsd);
+            }
+        };
+        var this_3 = this;
+        for (var _i = 0, _a = this.poolConfig.custodies; _i < _a.length; _i++) {
+            var custody = _a[_i];
+            _loop_3(custody);
+        }
+        return {
+            totalFees: totalFees,
+            totalVolume: totalVolume,
+            currentLongPositionsUsd: currentLongPositionsUsd,
+            currentShortPositionsUsd: currentShortPositionsUsd
+        };
+    };
     return PoolDisplayData;
-}()); // Pool
+}()); // PoolDisplayData
 exports.PoolDisplayData = PoolDisplayData;

package/lib/PositionAccount.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { Position, Side } from "./types";
-export declare class PositionAccount {
+export declare class PositionAccount implements Position {
     publicKey: PublicKey;
     owner: PublicKey;
     pool: PublicKey;
@@ -18,6 +17,7 @@ export declare class PositionAccount {
     cumulativeInterestSnapshot: BN;
     lockedAmount: BN;
     collateralAmount: BN;
+    bump: number;
     constructor(publicKey: PublicKey, parseData: Position);
     static from(publicKey: PublicKey, parseData: Position): PositionAccount;
     updatePositionData(position: Position): void;

package/lib/PositionAccount.js

@@ -50,7 +50,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PositionAccount = void 0;
 var anchor_1 = require("@coral-xyz/anchor");
 var PositionAccount = /** @class */ (function () {
-    // extra 
     function PositionAccount(publicKey, parseData) {
         this.publicKey = publicKey;
         Object.assign(this, parseData);

package/lib/client/src/PerpetualsClient.d.ts

@@ -1,16 +1,15 @@
-/// <reference types="bn.js" />
-/// <reference types="node" />
 import { Program, AnchorProvider, BN } from "@coral-xyz/anchor";
-import { PublicKey, Keypair } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
 import { PoolAccount } from "./PoolAccount";
 import { BorrowRateParams, Fees, OracleParams, Permissions, Position, PositionSide, PricingParams, TokenRatios } from "./types";
 import { OraclePrice } from "./OraclePrice";
-import CustodyAccount from "./CustodyAccount";
-import { Perpetuals } from "../../target/types/perpetuals";
+import { CustodyAccount } from "./CustodyAccount";
+import { Perpetuals } from "./target/types/perpetuals";
 export declare class PerpetualsClient {
     provider: AnchorProvider;
     program: Program<Perpetuals>;
-    admin: Keypair;
+    admin: PublicKey;
+    programId: PublicKey;
     multisig: {
         publicKey: PublicKey;
         bump: number;
@@ -23,7 +22,7 @@ export declare class PerpetualsClient {
         publicKey: PublicKey;
         bump: number;
     };
-    constructor(clusterUrl: string, adminKey: string);
+    constructor(provider: AnchorProvider, programId: PublicKey);
     findProgramAddress: (label: string, extraSeeds?: any) => {
         publicKey: PublicKey;
         bump: number;
@@ -1937,4 +1936,3 @@ export declare class PerpetualsClient {
     getSwapAmountAndFees: (poolName: string, tokenMintIn: PublicKey, tokenMintOut: PublicKey, amountIn: BN) => Promise<any>;
     getAum: (poolName: string) => Promise<any>;
 }
-//# sourceMappingURL=PerpetualsClient.d.ts.map