flash-sdk 1.0.4 → 1.0.6

package/lib/PoolAccount.d.ts

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

package/lib/PoolAccount.js

@@ -240,10 +240,10 @@ var PoolAccount = /** @class */ (function () {
             }
         }
     }; //getPnlUsd
-    PoolAccount.prototype.getAssetsUnderManagementUsd = function (token_prices, token_ema_prices, custodies, aum_calc_mode) {
+    PoolAccount.prototype.getAssetsUnderManagementUsd = function (token_prices, token_ema_prices, custodyAccounts, aum_calc_mode, currentTime) {
         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) {
+        for (var index = 0; index < custodyAccounts.length; index++) {
+            if (token_prices.length != custodyAccounts.length || token_prices.length != token_ema_prices.length) {
                 throw Error("token prices length incorrect");
             }
             var aum_token_price = void 0;
@@ -270,33 +270,20 @@ var PoolAccount = /** @class */ (function () {
                     aum_token_price = token_ema_prices[index];
                 }
             }
-            var token_amount_usd = aum_token_price.getAssetAmountUsd(custodies[index].assets.owned, custodies[index].decimals);
+            var token_amount_usd = 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)
+                var _a = this.getPnlUsd(custodyAccounts[index].getCollectivePosition(types_1.Side.Long), token_prices[index], token_ema_prices[index], custodyAccounts[index], currentTime, false), long_profit = _a.profit, long_loss = _a.loss;
+                // console.log("long_pos:",custodyAccounts[index].shortPositions)
+                var _b = this.getPnlUsd(custodyAccounts[index].getCollectivePosition(types_1.Side.Short), token_prices[index], token_ema_prices[index], custodyAccounts[index], currentTime, false), short_profit = _b.profit, short_loss = _b.loss;
+                // 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/lib/PoolConfig.d.ts

@@ -1,4 +1,4 @@
-import { Address } from '@project-serum/anchor';
+import { Address } from '@coral-xyz/anchor';
 import { Cluster, PublicKey } from '@solana/web3.js';
 export interface CustodyConfig {
     custodyAccount: PublicKey;
@@ -24,13 +24,18 @@ export declare class PoolConfig {
     lpTokenMint: PublicKey;
     lpDecimals: number;
     perpetuals: PublicKey;
+    transferAuthority: PublicKey;
+    multisig: PublicKey;
     tokens: Token[];
     custodies: CustodyConfig[];
-    constructor(programId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, lpTokenMint: PublicKey, lpDecimals: number, perpetuals: PublicKey, tokens: Token[], custodies: CustodyConfig[]);
+    constructor(programId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, lpTokenMint: PublicKey, lpDecimals: number, perpetuals: PublicKey, transferAuthority: PublicKey, multisig: PublicKey, tokens: Token[], custodies: CustodyConfig[]);
     getAllTokenMints(): PublicKey[];
     getNonStableTokens(): PublicKey[];
     getAllCustodies(): PublicKey[];
     getNonStableCustodies(): PublicKey[];
+    getTokenFromSymbol: (symbol: string) => Token;
+    getTokenFromMintString: (mint: string) => Token;
+    getTokenFromMintPk: (mint: PublicKey) => Token;
     static getCustodyConfig(custodyAccountPk: Address, poolName: string, cluster: Cluster): CustodyConfig;
     static getTokensInPool(name: string, cluster: Cluster): Token[];
     static fromIdsByName(name: string, cluster: Cluster): PoolConfig;

package/lib/PoolConfig.js

@@ -18,11 +18,8 @@ exports.PoolConfig = void 0;
 var web3_js_1 = require("@solana/web3.js");
 var PoolConfig_json_1 = __importDefault(require("./PoolConfig.json"));
 var PoolConfig = /** @class */ (function () {
-    function PoolConfig(programId, cluster, poolName, poolAddress, lpTokenMint, lpDecimals, perpetuals, 
-    // public perpMarketAccountKey: string,
-    // public multisigAccountKey: string,
-    // public transferAuthorityAccountKey: string,
-    tokens, custodies) {
+    function PoolConfig(programId, cluster, poolName, poolAddress, lpTokenMint, lpDecimals, perpetuals, transferAuthority, multisig, tokens, custodies) {
+        var _this = this;
         this.programId = programId;
         this.cluster = cluster;
         this.poolName = poolName;
@@ -30,8 +27,19 @@ var PoolConfig = /** @class */ (function () {
         this.lpTokenMint = lpTokenMint;
         this.lpDecimals = lpDecimals;
         this.perpetuals = perpetuals;
+        this.transferAuthority = transferAuthority;
+        this.multisig = multisig;
         this.tokens = tokens;
         this.custodies = custodies;
+        this.getTokenFromSymbol = function (symbol) {
+            return _this.tokens.find(function (f) { return f.symbol.toUpperCase() === symbol.toUpperCase(); });
+        };
+        this.getTokenFromMintString = function (mint) {
+            return _this.tokens.find(function (f) { return f.mintKey.toBase58() === mint; });
+        };
+        this.getTokenFromMintPk = function (mint) {
+            return _this.tokens.find(function (f) { return f.mintKey.equals(mint); });
+        };
     }
     PoolConfig.prototype.getAllTokenMints = function () {
         return Array.from(this.tokens.map(function (token) { return new web3_js_1.PublicKey(token.mintKey); }));
@@ -74,7 +82,7 @@ var PoolConfig = /** @class */ (function () {
         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) });
         });
-        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), tokens, custodies);
+        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);
     };
     PoolConfig.fromIdsByPk = function (poolPk, cluster) {
         var poolConfig = PoolConfig_json_1.default.pools.find(function (pool) { return pool['poolAddress'] === poolPk.toString() && cluster === pool['cluster']; });
@@ -86,7 +94,7 @@ var PoolConfig = /** @class */ (function () {
         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) });
         });
-        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), tokens, custodies);
+        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);
     };
     return PoolConfig;
 }());

package/lib/PoolConfig.json

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

package/lib/{PoolDisplayData.d.ts → PoolDataClient.d.ts}

@@ -1,9 +1,10 @@
+/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { Mint } from "@solana/spl-token";
 import { CustodyAccount } from "./CustodyAccount";
 import { PoolConfig } from "./PoolConfig";
 import { PoolAccount } from "./PoolAccount";
-export declare class PoolDisplayData {
+export declare class PoolDataClient {
     poolConfig: PoolConfig;
     pool: PoolAccount;
     lpTokenInfo: Mint;
@@ -12,7 +13,7 @@ export declare class PoolDisplayData {
     constructor(poolConfig: PoolConfig, pool: PoolAccount, lpTokenInfo: Mint, custodies: CustodyAccount[]);
     loadCustodies(custodies: CustodyAccount[]): void;
     loadPoolData(pool: PoolAccount): void;
-    loadlpData(lpTokenInfo: Mint): void;
+    loadLpData(lpTokenInfo: Mint): void;
     getLpStats(prices: any): {
         lpTokenSupply: BN;
         decimals: number;

package/lib/{PoolDisplayData.js → PoolDataClient.js}

@@ -1,29 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PoolDisplayData = void 0;
+exports.PoolDataClient = 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(poolConfig, pool, lpTokenInfo, custodies) {
+var PoolDataClient = /** @class */ (function () {
+    function PoolDataClient(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) {
+    PoolDataClient.prototype.loadCustodies = function (custodies) {
         this.custodies = custodies;
     };
-    PoolDisplayData.prototype.loadPoolData = function (pool) {
+    PoolDataClient.prototype.loadPoolData = function (pool) {
         this.pool = pool;
     };
-    PoolDisplayData.prototype.loadlpData = function (lpTokenInfo) {
+    PoolDataClient.prototype.loadLpData = function (lpTokenInfo) {
         this.lpTokenInfo = lpTokenInfo;
     };
     // TODO :: replace this with PoolAccount.getAssetsUnderManagementUsd() 
     // should take pnl's into account 
-    PoolDisplayData.prototype.getLpStats = function (prices) {
+    PoolDataClient.prototype.getLpStats = function (prices) {
         var stableCoinAmount = new anchor_1.BN(0);
         var totalPoolValueUsd = new anchor_1.BN(0);
         var _loop_1 = function (custody) {
@@ -60,14 +60,14 @@ var PoolDisplayData = /** @class */ (function () {
             // totalStaked : BN,
         };
     };
-    PoolDisplayData.prototype.getOiLongUI = function () {
+    PoolDataClient.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 () {
+    PoolDataClient.prototype.getOiShortUI = function () {
         var totalAmount = new anchor_1.BN('0');
         this.custodies.forEach(function (i) {
             totalAmount = totalAmount.add(i.tradeStats.oiShortUsd);
@@ -75,7 +75,7 @@ var PoolDisplayData = /** @class */ (function () {
         return totalAmount;
     };
     // handle decimal and this should accept a list of prices probs map or object
-    PoolDisplayData.prototype.getCustodyDetails = function (prices) {
+    PoolDataClient.prototype.getCustodyDetails = function (prices) {
         var custodyDetails = [];
         var _loop_2 = function (i) {
             var custody = this_2.poolConfig.custodies[i];
@@ -119,7 +119,7 @@ var PoolDisplayData = /** @class */ (function () {
         }
         return custodyDetails;
     };
-    PoolDisplayData.prototype.getPoolStats = function () {
+    PoolDataClient.prototype.getPoolStats = function () {
         var totalFees = new anchor_1.BN(0);
         var totalVolume = new anchor_1.BN(0);
         var currentLongPositionsUsd = new anchor_1.BN(0);
@@ -147,6 +147,6 @@ var PoolDisplayData = /** @class */ (function () {
             currentShortPositionsUsd: currentShortPositionsUsd
         };
     };
-    return PoolDisplayData;
+    return PoolDataClient;
 }()); // PoolDisplayData
-exports.PoolDisplayData = PoolDisplayData;
+exports.PoolDataClient = PoolDataClient;

package/lib/PositionAccount.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { Position, Side } from "./types";

package/lib/Token.js

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

package/lib/constants/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { Cluster } from "@solana/web3.js";
 export declare const DEFAULT_CLUSTER: Cluster;
 export declare const DEFAULT_POOL: string;