Merge pull request #3507 from xiangxn/fix-3286

Fix the margin call price in UI is wrong #3286
bitshares · Apr 26, 2022 · 72a272b · 72a272b
2 parents 155c606 + f9fb67e
commit 72a272b
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 27 deletions.
diff --git a/app/components/Account/AccountOrders.jsx b/app/components/Account/AccountOrders.jsx
@@ -67,6 +67,7 @@ class AccountOrders extends React.Component {
             let base = null;
             let quote = null;
             let sqr = null;
+            let mcfr = null;
             let feed_price = null;
             let bitasset_options = null;
 
@@ -103,10 +104,18 @@ class AccountOrders extends React.Component {
                         "maximum_short_squeeze_ratio"
                     ]);
 
+                    mcfr = base.getIn([
+                        "bitasset",
+                        "options",
+                        "extensions",
+                        "margin_call_fee_ratio"
+                    ]);
+
                     feed_price = new FeedPrice({
                         priceObject: feedPriceRaw,
                         market_base: marketBaseId,
                         sqr,
+                        mcfr,
                         assets
                     });
 
@@ -777,19 +786,16 @@ class AccountOrders extends React.Component {
     }
 }
 
-AccountOrders = connect(
-    AccountOrders,
-    {
-        listenTo() {
-            return [SettingsStore];
-        },
-        getProps() {
-            return {
-                marketDirections: SettingsStore.getState().marketDirections,
-                viewSettings: SettingsStore.getState().viewSettings
-            };
-        }
+AccountOrders = connect(AccountOrders, {
+    listenTo() {
+        return [SettingsStore];
+    },
+    getProps() {
+        return {
+            marketDirections: SettingsStore.getState().marketDirections,
+            viewSettings: SettingsStore.getState().viewSettings
+        };
     }
-);
+});
 
 export default AccountOrders;
diff --git a/app/components/Blockchain/Asset.jsx b/app/components/Blockchain/Asset.jsx
@@ -183,6 +183,13 @@ class Asset extends React.Component {
             "maximum_short_squeeze_ratio"
         ]);
 
+        let mcfr = this.props.asset.getIn([
+            "bitasset",
+            "options",
+            "extensions",
+            "margin_call_fee_ratio"
+        ]);
+
         let feedPriceRaw = assetUtils.extractRawFeedPrice(this.props.asset);
 
         // if there has been no feed price, settlePrice has 0 amount
@@ -229,6 +236,7 @@ class Asset extends React.Component {
             priceObject: feedPriceRaw,
             market_base: this.props.asset.get("id"),
             sqr,
+            mcfr,
             assets
         });
 

diff --git a/app/lib/common/MarketClasses.js b/app/lib/common/MarketClasses.js
@@ -367,13 +367,14 @@ class Price {
 }
 
 class FeedPrice extends Price {
-    constructor({priceObject, assets, market_base, sqr, real = false}) {
+    constructor({priceObject, assets, market_base, sqr, mcfr, real = false}) {
         if (
             !priceObject ||
             typeof priceObject !== "object" ||
             !market_base ||
             !assets ||
-            !sqr
+            !sqr ||
+            !mcfr
         ) {
             throw new Error("Invalid FeedPrice inputs");
         }
@@ -404,19 +405,25 @@ class FeedPrice extends Price {
 
         this.sqr = parseInt(sqr, 10) / 1000;
         this.inverted = inverted;
+        if (!mcfr) this.mcfr = 0;
+        else this.mcfr = parseInt(mcfr, 10) / 1000;
     }
 
     getSqueezePrice({real = false} = {}) {
         if (!this._squeeze_price) {
             this._squeeze_price = this.clone();
             if (this.inverted) {
                 this._squeeze_price.base.amount = Math.floor(
-                    this._squeeze_price.base.amount * this.sqr * 1000
+                    this._squeeze_price.base.amount *
+                        (this.sqr - this.mcfr) *
+                        1000
                 );
                 this._squeeze_price.quote.amount *= 1000;
             } else if (!this.inverted) {
                 this._squeeze_price.quote.amount = Math.floor(
-                    this._squeeze_price.quote.amount * this.sqr * 1000
+                    this._squeeze_price.quote.amount *
+                        (this.sqr - this.mcfr) *
+                        1000
                 );
                 this._squeeze_price.base.amount *= 1000;
             }
@@ -899,25 +906,25 @@ class CallOrder {
         let orderDebt = order.iSum
             ? order.debt
             : orderUseCR
-                ? order.max_debt_to_cover.getAmount()
-                : order.amountToReceive().getAmount();
+            ? order.max_debt_to_cover.getAmount()
+            : order.amountToReceive().getAmount();
         let newOrderDebt = newOrder.iSum
             ? newOrder.debt
             : newOrderUseCR
-                ? newOrder.max_debt_to_cover.getAmount()
-                : newOrder.amountToReceive().getAmount();
+            ? newOrder.max_debt_to_cover.getAmount()
+            : newOrder.amountToReceive().getAmount();
 
         /* Determine which collateral values to use */
         let orderCollateral = order.iSum
             ? order.collateral
             : orderUseCR
-                ? order.max_collateral_to_sell.getAmount()
-                : order.amountForSale().getAmount();
+            ? order.max_collateral_to_sell.getAmount()
+            : order.amountForSale().getAmount();
         let newOrderCollateral = newOrder.iSum
             ? newOrder.collateral
             : newOrderUseCR
-                ? newOrder.max_collateral_to_sell.getAmount()
-                : newOrder.amountForSale().getAmount();
+            ? newOrder.max_collateral_to_sell.getAmount()
+            : newOrder.amountForSale().getAmount();
 
         newOrder.debt = newOrderDebt + orderDebt;
         newOrder.collateral = newOrderCollateral + orderCollateral;
@@ -1232,8 +1239,8 @@ class FillOrder {
         this.className = this.isCall
             ? "orderHistoryCall"
             : this.isBid
-                ? "orderHistoryBid"
-                : "orderHistoryAsk";
+            ? "orderHistoryBid"
+            : "orderHistoryAsk";
         this.time = fill.time && new Date(utils.makeISODateString(fill.time));
         this.block = fill.block;
         this.account = fill.op.account || fill.op.account_id;

diff --git a/app/lib/common/accountHelper.js b/app/lib/common/accountHelper.js
@@ -73,6 +73,9 @@ function checkMarginStatus(account) {
                                 sqr:
                                     debtAsset.bitasset.current_feed
                                         .maximum_short_squeeze_ratio,
+                                mcfr:
+                                    debtAsset.bitasset.options.extensions
+                                        .margin_call_fee_ratio,
                                 assets: assetsMap
                             });
                             let current = {

diff --git a/app/stores/MarketsStore.js b/app/stores/MarketsStore.js
@@ -755,6 +755,14 @@ class MarketsStore {
                 "current_feed",
                 "maximum_short_squeeze_ratio"
             ]);
+            let mcfr = this[
+                this.invertedCalls ? "baseAsset" : "quoteAsset"
+            ].getIn([
+                "bitasset",
+                "options",
+                "extensions",
+                "margin_call_fee_ratio"
+            ]);
 
             this.is_prediction_market = this[
                 this.invertedCalls ? "baseAsset" : "quoteAsset"
@@ -791,6 +799,7 @@ class MarketsStore {
                 priceObject: feedPriceRaw,
                 market_base: this.quoteAsset.get("id"),
                 sqr,
+                mcfr,
                 assets
             });