From 1844035abb83c40af84d49fc0382fe5cf9c11aca Mon Sep 17 00:00:00 2001
From: c9s <yoanlin93@gmail.com>
Date: Wed, 4 May 2022 16:56:31 +0800
Subject: [PATCH] fix asset calculation

---
 pkg/types/account.go | 52 ++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/pkg/types/account.go b/pkg/types/account.go
index 72bceb5c1..04c1a81e5 100644
--- a/pkg/types/account.go
+++ b/pkg/types/account.go
@@ -212,41 +212,37 @@ func (m BalanceMap) Assets(prices map[string]fixedpoint.Value, priceTime time.Ti
 		}
 
 		asset := Asset{
-			Currency:   currency,
-			Total:      b.Available.Add(b.Locked),
-			Time:       priceTime,
-			Locked:     b.Locked,
-			Available:  b.Available,
-			Borrowed:   b.Borrowed,
-			NetAsset:   b.NetAsset,
+			Currency:  currency,
+			Total:     b.Available.Add(b.Locked),
+			Time:      priceTime,
+			Locked:    b.Locked,
+			Available: b.Available,
+			Borrowed:  b.Borrowed,
+			NetAsset:  b.NetAsset,
 		}
 
 		usdMarkets := []string{currency + "USDT", currency + "USDC", currency + "USD", "USDT" + currency}
 		for _, market := range usdMarkets {
-			usdPrice, ok := prices[market]
-			if !ok {
-				continue
-			}
-
-			// this includes USDT, USD, USDC and so on
-			if strings.HasPrefix(market, "USD") {
-				if !asset.Total.IsZero() {
-					asset.InUSD = asset.Total.Div(usdPrice)
+			if usdPrice, ok := prices[market] ; ok {
+				// this includes USDT, USD, USDC and so on
+				if strings.HasPrefix(market, "USD") {
+					if !asset.Total.IsZero() {
+						asset.InUSD = asset.Total.Div(usdPrice)
+					}
+					asset.PriceInUSD = usdPrice
+				} else {
+					if !asset.Total.IsZero() {
+						asset.InUSD = asset.Total.Mul(usdPrice)
+					}
+					asset.PriceInUSD = fixedpoint.One.Div(usdPrice)
 				}
-				asset.PriceInUSD = usdPrice
-			} else {
-				if !asset.Total.IsZero() {
-					asset.InUSD = asset.Total.Mul(usdPrice)
-				}
-				asset.PriceInUSD = fixedpoint.One.Div(usdPrice)
-			}
 
-			if hasBtcPrice && !asset.InUSD.IsZero() {
-				asset.InBTC = asset.InUSD.Div(btcusdt)
+				if hasBtcPrice && !asset.InUSD.IsZero() {
+					asset.InBTC = asset.InUSD.Div(btcusdt)
+				}
 			}
+			assets[currency] = asset
 		}
-
-		assets[currency] = asset
 	}
 
 	return assets
@@ -312,8 +308,6 @@ type Account struct {
 	balances BalanceMap
 }
 
-
-
 type FuturesAccountInfo struct {
 	// Futures fields
 	Assets                      FuturesAssetMap    `json:"assets"`