[waitting #403]Hot temporary fix v2

docs/client/swagger.yaml

@@ -6034,9 +6034,35 @@ paths:
               fees_24hours:
                 type: string
               long_positions:
-                type: string
+                type: object
+                properties:
+                  denom:
+                    type: string
+                  amount:
+                    type: string
+                description: >-
+                  Coin defines a token with a denomination and an amount.
+
+
+                  NOTE: The amount field is an Int which implements the custom
+                  method
+
+                  signatures required by gogoproto.
               short_positions:
-                type: string
+                type: object
+                properties:
+                  denom:
+                    type: string
+                  amount:
+                    type: string
+                description: >-
+                  Coin defines a token with a denomination and an amount.
+
+
+                  NOTE: The amount field is an Int which implements the custom
+                  method
+
+                  signatures required by gogoproto.
         default:
           description: An unexpected error response.
           schema:
@@ -13575,9 +13601,29 @@ definitions:
       fees_24hours:
         type: string
       long_positions:
-        type: string
+        type: object
+        properties:
+          denom:
+            type: string
+          amount:
+            type: string
+        description: |-
+          Coin defines a token with a denomination and an amount.
+
+          NOTE: The amount field is an Int which implements the custom method
+          signatures required by gogoproto.
       short_positions:
-        type: string
+        type: object
+        properties:
+          denom:
+            type: string
+          amount:
+            type: string
+        description: |-
+          Coin defines a token with a denomination and an amount.
+
+          NOTE: The amount field is an Int which implements the custom method
+          signatures required by gogoproto.
   ununifi.derivatives.QueryPerpetualOptionsMarketResponse:
     type: object
   ununifi.derivatives.QueryPerpetualOptionsResponse:

docs/core/proto-docs.md

@@ -2134,8 +2134,8 @@ QueryParamsResponse is response type for the Query/Params RPC method.
 | `metrics_quote_ticker` | [string](#string) |  |  |
 | `volume_24hours` | [string](#string) |  |  |
 | `fees_24hours` | [string](#string) |  |  |
-| `long_positions` | [string](#string) |  |  |
-| `short_positions` | [string](#string) |  |  |
+| `long_positions` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) |  |  |
+| `short_positions` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) |  |  |
 
 
 

proto/derivatives/query.proto

@@ -151,13 +151,13 @@ message QueryPerpetualFuturesResponse {
     (gogoproto.moretags)  = "yaml:\"fees_24hours\"",
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"
   ];
-  string long_positions = 5 [
+  cosmos.base.v1beta1.Coin long_positions = 5 [
     (gogoproto.moretags)  = "yaml:\"long_positions\"",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"
+    (gogoproto.nullable) = false
   ];
-  string short_positions = 6 [
+  cosmos.base.v1beta1.Coin short_positions = 6 [
     (gogoproto.moretags)  = "yaml:\"short_positions\"",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"
+    (gogoproto.nullable) = false
   ];
 }
 

x/derivatives/abci.go

@@ -1,6 +1,8 @@
 package derivatives
 
 import (
+	"fmt"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/UnUniFi/chain/x/derivatives/keeper"
@@ -32,7 +34,10 @@ func CheckPosition(ctx sdk.Context, k keeper.Keeper) {
 	for _, position := range positions {
 		currentBaseUsdRate, currentQuoteUsdRate, err := k.GetPairUsdPriceFromMarket(ctx, position.Market)
 		if err != nil {
-			panic(err)
+			// todo: user logger
+			fmt.Println("failed to get pair usd price from market")
+			fmt.Println(err)
+			continue
 		}
 		if position.NeedLiquidation(params.PerpetualFutures.MarginMaintenanceRate, currentBaseUsdRate, currentQuoteUsdRate) {
 			msg := types.MsgReportLiquidation{

x/derivatives/keeper/grpc_query.go

@@ -49,8 +49,10 @@ func (k Keeper) PerpetualFutures(c context.Context, req *types.QueryPerpetualFut
 		}
 	}
 
-	longUsd := positions.EvaluateLongPositions(getPriceFunc(ctx))
-	shortUsd := positions.EvaluateShortPositions(getPriceFunc(ctx))
+	longUUsd := positions.EvaluateLongPositions(getPriceFunc(ctx))
+	shortUUsd := positions.EvaluateShortPositions(getPriceFunc(ctx))
+	longUsd := types.MicroToNormalDenom(longUUsd)
+	shortUsd := types.MicroToNormalDenom(shortUUsd)
 	// TODO: implement the handler logic
 	ctx.BlockHeight()
 	metricsQuoteTicker := "USD"
@@ -61,8 +63,8 @@ func (k Keeper) PerpetualFutures(c context.Context, req *types.QueryPerpetualFut
 		MetricsQuoteTicker: metricsQuoteTicker,
 		Volume_24Hours:     &volume24Hours,
 		Fees_24Hours:       &fees24Hours,
-		LongPositions:      &longUsd,
-		ShortPositions:     &shortUsd,
+		LongPositions:      sdk.NewCoin("usd", longUsd),
+		ShortPositions:     sdk.NewCoin("usd", shortUsd),
 	}, nil
 }
 
@@ -210,11 +212,20 @@ func (k Keeper) MakeQueriedPositions(ctx sdk.Context, positions types.Positions)
 		}
 
 		profit := perpetualFuturesPosition.ProfitAndLossInMetrics(currentBaseUsdRate, currentQuoteUsdRate)
+		// fixme do not use sdk.Coin directly
+		positiveOrNegativeProfitCoin := sdk.Coin{
+			Denom:  "uusd",
+			Amount: types.MicroToNormalDenom(profit),
+		}
+		positiveOrNegativeEffectiveMargin := sdk.Coin{
+			Denom:  "uusd",
+			Amount: types.MicroToNormalDenom(perpetualFuturesPosition.EffectiveMarginInMetrics(currentBaseUsdRate, currentQuoteUsdRate)),
+		}
 		queriedPosition := types.QueriedPosition{
 			Position:              position,
-			ValuationProfit:       sdk.NewCoin("uusd", types.MicroToNormalDenom(profit)),
+			ValuationProfit:       positiveOrNegativeProfitCoin,
 			MarginMaintenanceRate: perpetualFuturesPosition.MarginMaintenanceRate(currentBaseUsdRate, currentQuoteUsdRate),
-			EffectiveMargin:       sdk.NewCoin("uusd", types.MicroToNormalDenom(perpetualFuturesPosition.EffectiveMarginInMetrics(currentBaseUsdRate, currentQuoteUsdRate))),
+			EffectiveMargin:       positiveOrNegativeEffectiveMargin,
 		}
 		queriedPositions = append(queriedPositions, queriedPosition)
 	}

x/derivatives/types/positions.go

@@ -116,10 +116,14 @@ func (m PerpetualFuturesPosition) EvaluatePosition(currentBaseUsdRate sdk.Dec) s
 	return currentBaseUsdRate.Mul(m.PositionInstance.Size_)
 }
 
-func MicroToNormalDenom(amount sdk.Dec) math.Int {
+func MicroToNormalDenom(amount sdk.Dec) sdk.Int {
 	return amount.Mul(sdk.MustNewDecFromStr("1000000")).TruncateInt()
 }
 
+func MicroToNormalDec(amount sdk.Dec) sdk.Dec {
+	return amount.Mul(sdk.MustNewDecFromStr("1000000"))
+}
+
 func (m PerpetualFuturesPosition) CalcReturningAmountAtClose(baseUSDRate, quoteUSDRate sdk.Dec) (returningAmount math.Int, lossToLP math.Int) {
 	principal := m.RemainingMargin.Amount
 	pnlAmount := m.ProfitAndLossInMetrics(baseUSDRate, quoteUSDRate)