flash-sdk 1.0.25 → 1.0.26

package/dist/PoolAccount.js

@@ -6,7 +6,7 @@ var anchor_1 = require("@coral-xyz/anchor");
 var types_1 = require("./types");
 var OraclePrice_1 = require("./OraclePrice");
 var utils_1 = require("./utils");
-var PoolAccount = /** @class */ (function () {
+var PoolAccount = (function () {
     function PoolAccount(publicKey, parseData) {
         this.publicKey = publicKey;
         Object.assign(this, parseData);
@@ -23,22 +23,10 @@ var PoolAccount = /** @class */ (function () {
     PoolAccount.prototype.getAddLiquidityFee = function (tokenId, amount, custody, tokenPrice) {
         return this.getFee(tokenId, custody.fees.addLiquidity, amount, new anchor_1.BN(0), custody, tokenPrice);
     };
-    // TODO 
     PoolAccount.prototype.getFee = function (tokenId, baseFee, amountAdd, amountRemove, custody, tokenPrice) {
         if (custody.fees.mode === types_1.FeesMode.Fixed) {
-            // return Self::get_fee_amount(base_fee, std::cmp::max(amount_add, amount_remove));
             return this.getFeeAmount(baseFee, anchor_1.BN.max(amountAdd, amountRemove));
         }
-        // === NOW FEE MODE IS FeesMode.Linear
-        // if token ratio is improved:
-        //    fee = base_fee / ratio_fee
-        // otherwise:
-        //    fee = base_fee * ratio_fee
-        // where:
-        //   if new_ratio < ratios.target:
-        //     ratio_fee = 1 + custody.fees.ratio_mult * (ratios.target - new_ratio) / (ratios.target - ratios.min);
-        //   otherwise:
-        //     ratio_fee = 1 + custody.fees.ratio_mult * (new_ratio - ratios.target) / (ratios.max - ratios.target);
         var ratios = this.ratios[tokenId];
         var current_ratio = this.getCurrentRatio(custody, tokenPrice);
         throw Error("TODODO");
@@ -60,14 +48,6 @@ var PoolAccount = /** @class */ (function () {
         if (this.aumUsd.isZero()) {
             return new anchor_1.BN(0);
         }
-        // let ratio = math::checked_as_u64(math::checked_div(
-        //     math::checked_mul(
-        //         token_price.get_asset_amount_usd(custody.assets.owned, custody.decimals)? as u128,
-        //         Perpetuals::BPS_POWER,
-        //     )?,
-        //     self.aum_usd,
-        // )?)?;
-        // Ok(std::cmp::min(ratio, Perpetuals::BPS_POWER as u64))
     };
     PoolAccount.getEntryPrice = function (token_price, token_ema_price, side, custody) {
         var price = PoolAccount.getPrice(token_price, token_ema_price, ((0, types_1.isVariant)(side, 'long')) ? types_1.Side.Long : types_1.Side.Short, ((0, types_1.isVariant)(side, 'long')) ? custody.pricing.tradeSpreadLong : custody.pricing.tradeSpreadShort);
@@ -80,10 +60,7 @@ var PoolAccount = /** @class */ (function () {
     PoolAccount.getPriceAfterSlippage = function (isEntry, slippageBps, token_price, token_ema_price, side, custody) {
         if (isEntry) {
             var current_price = this.getEntryPrice(token_price, token_ema_price, side, custody);
-            // console.log("getEntryPrice current_price:",current_price.toString())
-            // TODO:: checked USE
             var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS));
-            // console.log("getPriceAfterSlippage spread_i:",spread_i.toString());
             if ((0, types_1.isVariant)(side, 'long')) {
                 return current_price.add(spread_i);
             }
@@ -98,12 +75,8 @@ var PoolAccount = /** @class */ (function () {
             }
         }
         else {
-            // Opp in during close
             var current_price = this.getExitPrice(token_price, token_ema_price, side, custody);
-            // console.log("getExitPrice current_price:",current_price.toString())
-            // TODO:: checked USE
             var spread_i = (0, utils_1.checkedDecimalCeilMul)(current_price, new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS), slippageBps, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS));
-            // console.log("spread_i:",spread_i);
             if ((0, types_1.isVariant)(side, 'long')) {
                 if (spread_i.lt(current_price)) {
                     return current_price.sub(spread_i);
@@ -120,7 +93,6 @@ var PoolAccount = /** @class */ (function () {
     };
     PoolAccount.getPrice = function (token_price, token_ema_price, side, spread) {
         if ((0, types_1.isVariant)(side, 'long')) {
-            // console.log("inside long")
             var max_price = void 0;
             if (token_price.cmp(token_ema_price)) {
                 max_price = token_price;
@@ -130,14 +102,12 @@ var PoolAccount = /** @class */ (function () {
             }
             ;
             var spread_i = (0, utils_1.checkedDecimalCeilMul)(max_price.price, max_price.exponent, spread, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), max_price.exponent);
-            // console.log("getPrice spread_i:",spread_i.toString());
             return new OraclePrice_1.OraclePrice({
                 price: max_price.price.add(spread_i),
                 exponent: max_price.exponent,
             });
         }
         else {
-            // console.log("inside short ")
             var min_price = void 0;
             if (token_price.cmp(token_ema_price)) {
                 min_price = token_ema_price;
@@ -147,7 +117,6 @@ var PoolAccount = /** @class */ (function () {
             }
             ;
             var spread_i = (0, utils_1.checkedDecimalMul)(min_price.price, min_price.exponent, spread, new anchor_1.BN(-1 * constants_1.BPS_DECIMALS), min_price.exponent);
-            // console.log("spread_i:",spread_i.toString())
             var price = void 0;
             if (spread_i.lt(min_price.price)) {
                 price = min_price.price.sub(spread_i);
@@ -179,9 +148,7 @@ var PoolAccount = /** @class */ (function () {
         }
         ;
         var exit_price = PoolAccount.getExitPrice(token_price, token_ema_price, position.side, custody);
-        // console.log("exit_price:",exit_price, exit_price?.toString())
         var size = token_ema_price.getTokenAmount(position.sizeUsd, custody.decimals);
-        // console.log("size:",size, size?.toString())
         var exit_fee;
         if (liquidation) {
             exit_fee = this.getLiquidationFee(size, custody);
@@ -190,13 +157,9 @@ var PoolAccount = /** @class */ (function () {
             exit_fee = this.getExitFee(size, custody);
         }
         ;
-        // console.log("exit_fee:",exit_fee.toString())
         var exit_fee_usd = token_ema_price.getAssetAmountUsd(exit_fee, custody.decimals);
-        // console.log("exit_fee_usd:",exit_fee_usd.toString())
         var interest_usd = custody.getInterestAmountUsd(position, curtime);
-        // console.log("interest_usd:",interest_usd.toString())
         var unrealized_loss_usd = (exit_fee_usd.add(interest_usd)).add(position.unrealizedLossUsd);
-        // console.log("unrealized_loss_usd:",unrealized_loss_usd.toString())
         var price_diff_profit, price_diff_loss;
         if ((0, types_1.isVariant)(position.side, 'long')) {
             if (exit_price.gt(position.price)) {
@@ -217,19 +180,13 @@ var PoolAccount = /** @class */ (function () {
             price_diff_loss = exit_price.sub(position.price);
         }
         ;
-        // console.log("1 price_diff_profit:",price_diff_profit.toString())
-        // console.log("2 price_diff_loss:",price_diff_loss.toString())
         var position_price = (0, utils_1.scaleToExponent)(position.price, new anchor_1.BN(-1 * constants_1.PRICE_DECIMALS), new anchor_1.BN(-1 * constants_1.USD_DECIMALS));
-        // console.log("position_price:",position_price.toString())
         if (price_diff_profit.gt(constants_1.BN_ZERO)) {
             var potential_profit_usd = (position.sizeUsd.mul(price_diff_profit)).div(position_price);
             potential_profit_usd = potential_profit_usd.add(position.unrealizedProfitUsd);
-            // console.log("potential_profit_usd:",potential_profit_usd.toString())
             if (potential_profit_usd.gte(unrealized_loss_usd)) {
                 var cur_profit_usd = potential_profit_usd.sub(unrealized_loss_usd);
                 var max_profit_usd = min_price.getAssetAmountUsd(position.lockedAmount, custody.decimals);
-                // console.log("cur_profit_usd:",cur_profit_usd.toString())
-                // console.log("max_profit_usd:",max_profit_usd.toString())
                 return {
                     profit: anchor_1.BN.min(max_profit_usd, cur_profit_usd),
                     loss: constants_1.BN_ZERO,
@@ -237,8 +194,6 @@ var PoolAccount = /** @class */ (function () {
                 };
             }
             else {
-                // console.log(" -- unrealized_loss_usd:",unrealized_loss_usd.toString())
-                // console.log(" -- potential_profit_usd:",potential_profit_usd.toString())
                 return {
                     profit: constants_1.BN_ZERO,
                     loss: unrealized_loss_usd.sub(potential_profit_usd),
@@ -249,9 +204,7 @@ var PoolAccount = /** @class */ (function () {
         else {
             var potential_loss_usd = (0, utils_1.checkedCeilDiv)(position.sizeUsd.mul(price_diff_loss), position_price);
             potential_loss_usd = potential_loss_usd.add(unrealized_loss_usd);
-            //  console.log("potential_loss_usd:",potential_loss_usd.toString())
             if (potential_loss_usd.gte(position.unrealizedProfitUsd)) {
-                //  console.log("position.unrealizedProfitUsd:",position.unrealizedProfitUsd.toString())
                 return {
                     profit: constants_1.BN_ZERO,
                     loss: potential_loss_usd.sub(position.unrealizedProfitUsd),
@@ -261,8 +214,6 @@ var PoolAccount = /** @class */ (function () {
             else {
                 var cur_profit_usd = position.unrealizedProfitUsd.sub(potential_loss_usd);
                 var max_profit_usd = min_price.getAssetAmountUsd(position.lockedAmount, custody.decimals);
-                //  console.log("cur_profit_usd:",cur_profit_usd.toString())
-                //  console.log("max_profit_usd:",max_profit_usd.toString())
                 return {
                     profit: anchor_1.BN.min(max_profit_usd, cur_profit_usd),
                     loss: constants_1.BN_ZERO,
@@ -270,7 +221,7 @@ var PoolAccount = /** @class */ (function () {
                 };
             }
         }
-    }; //getPnlUsd
+    };
     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 < custodyAccounts.length; index++) {
@@ -278,7 +229,6 @@ var PoolAccount = /** @class */ (function () {
                 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];
             }
@@ -304,20 +254,16 @@ var PoolAccount = /** @class */ (function () {
             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 (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(long_loss);
                 pool_amount_usd = pool_amount_usd.sub(short_loss);
             }
         }
         return pool_amount_usd;
     };
     return PoolAccount;
-}()); // Pool
+}());
 exports.PoolAccount = PoolAccount;

package/dist/PoolConfig.js

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PoolConfig = void 0;
 var web3_js_1 = require("@solana/web3.js");
 var PoolConfig_json_1 = __importDefault(require("./PoolConfig.json"));
-var PoolConfig = /** @class */ (function () {
+var PoolConfig = (function () {
     function PoolConfig(programId, cluster, poolName, poolAddress, lpTokenMint, lpDecimals, perpetuals, transferAuthority, multisig, tokens, custodies) {
         var _this = this;
         this.programId = programId;
@@ -57,9 +57,6 @@ var PoolConfig = /** @class */ (function () {
             .filter(function (custody) { return !custody.isStable; })
             .map(function (custody) { return new web3_js_1.PublicKey(custody.custodyAccount); }));
     };
-    // static getAllPoolConfigs(cluster: Cluster): PoolConfig[] {
-    //   return poolConfigs.pools.map(p => this.fromIdsByName(p.poolName, cluster))
-    // }
     PoolConfig.getCustodyConfig = function (custodyAccountPk, poolName, cluster) {
         return this.fromIdsByName(poolName, cluster).custodies.find(function (f) { return f.custodyAccount.toBase58() === custodyAccountPk.toString(); });
     };

package/dist/PoolDataClient.js

@@ -4,13 +4,13 @@ exports.PoolDataClient = void 0;
 var constants_1 = require("./constants");
 var anchor_1 = require("@coral-xyz/anchor");
 var utils_1 = require("./utils");
-var PoolDataClient = /** @class */ (function () {
+var PoolDataClient = (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
+        this.totalPoolValueUsd = new anchor_1.BN(-1);
     }
     PoolDataClient.prototype.loadCustodies = function (custodies) {
         this.custodies = custodies;
@@ -21,8 +21,6 @@ var PoolDataClient = /** @class */ (function () {
     PoolDataClient.prototype.loadLpData = function (lpTokenInfo) {
         this.lpTokenInfo = lpTokenInfo;
     };
-    // TODO :: replace this with PoolAccount.getAssetsUnderManagementUsd() 
-    // should take pnl's into account 
     PoolDataClient.prototype.getLpStats = function (prices) {
         var stableCoinAmount = new anchor_1.BN(0);
         var totalPoolValueUsd = new anchor_1.BN(0);
@@ -32,7 +30,7 @@ var PoolDataClient = /** @class */ (function () {
                 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 priceBN = new anchor_1.BN(prices.get(custody.symbol) * Math.pow(10, constants_1.PRICE_DECIMALS));
                 var custodyValue = priceBN.mul(custodyData.assets.owned).div(new anchor_1.BN(Math.pow(10, custody.decimals)));
                 totalPoolValueUsd = totalPoolValueUsd.add(custodyValue);
             }
@@ -42,12 +40,6 @@ var PoolDataClient = /** @class */ (function () {
             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 {
@@ -57,7 +49,6 @@ var PoolDataClient = /** @class */ (function () {
             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,
         };
     };
     PoolDataClient.prototype.getOiLongUI = function () {
@@ -74,27 +65,19 @@ var PoolDataClient = /** @class */ (function () {
         });
         return totalAmount;
     };
-    // handle decimal and this should accept a list of prices probs map or object
     PoolDataClient.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 
+            var priceBN = new anchor_1.BN(prices.get(custody.symbol) * Math.pow(10, 6));
             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,
@@ -106,9 +89,7 @@ var PoolDataClient = /** @class */ (function () {
                     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),
                 });
             }
@@ -148,5 +129,5 @@ var PoolDataClient = /** @class */ (function () {
         };
     };
     return PoolDataClient;
-}()); // PoolDisplayData
+}());
 exports.PoolDataClient = PoolDataClient;

package/dist/PositionAccount.js

@@ -49,7 +49,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PositionAccount = void 0;
 var anchor_1 = require("@coral-xyz/anchor");
-var PositionAccount = /** @class */ (function () {
+var PositionAccount = (function () {
     function PositionAccount(publicKey, parseData) {
         this.publicKey = publicKey;
         Object.assign(this, parseData);
@@ -66,9 +66,9 @@ var PositionAccount = /** @class */ (function () {
                 try {
                 }
                 catch (error) {
-                    return [2 /*return*/, new anchor_1.BN(0)];
+                    return [2, new anchor_1.BN(0)];
                 }
-                return [2 /*return*/];
+                return [2];
             });
         });
     };
@@ -78,9 +78,9 @@ var PositionAccount = /** @class */ (function () {
                 try {
                 }
                 catch (error) {
-                    return [2 /*return*/, new anchor_1.BN(0)];
+                    return [2, new anchor_1.BN(0)];
                 }
-                return [2 /*return*/];
+                return [2];
             });
         });
     };

package/dist/Token.js

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

package/dist/constants/index.js

@@ -4,13 +4,13 @@ exports.BN_ONE = exports.BN_ZERO = exports.RATE_POWER = exports.RATE_DECIMALS =
 var bn_js_1 = require("bn.js");
 exports.DEFAULT_CLUSTER = 'devnet';
 exports.DEFAULT_POOL = 'pool1';
-exports.PERCENTAGE_DECIMALS = 4; // stableCoinPercentage
+exports.PERCENTAGE_DECIMALS = 4;
 exports.PRICE_DECIMALS = 6;
 exports.USD_DECIMALS = 6;
 exports.BPS_DECIMALS = 4;
 exports.BPS_POWER = Math.pow(10, (exports.BPS_DECIMALS));
 exports.LP_DECIMALS = exports.USD_DECIMALS;
-exports.RATE_DECIMALS = 9; // borow rate 
+exports.RATE_DECIMALS = 9;
 exports.RATE_POWER = Math.pow(10, (exports.RATE_DECIMALS));
 exports.BN_ZERO = new bn_js_1.BN(0);
 exports.BN_ONE = new bn_js_1.BN(1);

package/dist/index.js

@@ -28,4 +28,3 @@ __exportStar(require("./PoolDataClient"), exports);
 var perpetuals_1 = require("./idl/perpetuals");
 Object.defineProperty(exports, "IDL", { enumerable: true, get: function () { return perpetuals_1.IDL; } });
 __exportStar(require("./utils/rpc"), exports);
-// export { default as PoolConfigJson } from "./PoolConfig.json";