exchanges: fix volume calculation bug in *ExchangeBot.processState

Author: ukane-philemon

cmd/dcrdata/public/js/controllers/market_controller.js

@@ -33,12 +33,15 @@ const prettyDurations = {
 }
 const exchangeLinks = {
   CurrencyPairDCRBTC: {
-    dcrdex: 'https://dex.decred.org'
+    dcrdex: 'https://dex.decred.org',
+    coinex: 'https://www.coinex.com/en/exchange/DCR-BTC'
   },
   CurrencyPairDCRUSDT: {
     binance: 'https://www.binance.com/en/trade/DCR_USDT',
     dcrdex: 'https://dex.decred.org',
-    mexc: 'https://www.mexc.com/exchange/DCR_USDT'
+    mexc: 'https://www.mexc.com/exchange/DCR_USDT',
+    kucoin: 'https://www.kucoin.com/trade/DCR-USDT',
+    coinex: 'https://www.coinex.com/en/exchange/DCR-USDT'
   }
 }
 const CurrencyPairDCRUSDT = 'DCR-USDT'

cmd/dcrdata/views/extras.tmpl

@@ -67,7 +67,7 @@
 	<link rel="preload" href="/images/connected.svg?x=65tv3" as="image" type="image/svg+xml" />
 	<link rel="preload" href="/images/disconnected.svg?x=65tv3" as="image" type="image/svg+xml" />
 
-	<link href="/dist/css/style.16ae332755b66248.css" rel="stylesheet">
+	<link href="/dist/css/style.0fa8da7a4d68be40.css" rel="stylesheet">
 
 	<script src="/js/vendor/turbolinks.min.js?v=65DCG"></script>
 </head>
@@ -188,12 +188,12 @@
 		</span>
 	</div>
 	<script
-		src="/dist/js/4.9eec6eb13cc00a3d.bundle.js"
+		src="/dist/js/4.06b06a4759f2b4ad.bundle.js"
 		data-turbolinks-eval="false"
 		data-turbolinks-suppress-warning
 	></script>
 	<script
-		src="/dist/js/app.a882ac4b6d92599f.bundle.js"
+		src="/dist/js/app.fbea774a52e72f1a.bundle.js"
 		data-turbolinks-eval="false"
 		data-turbolinks-suppress-warning
 	></script>

exchanges/bot.go

@@ -819,22 +819,15 @@ func (bot *ExchangeBot) cachedChartVersion(chartId string) int {
 
 // processState is a helper function to process a slice of ExchangeState into a
 // price, and optionally a volume sum, and perform some cleanup along the way.
-// If volumeAveraged is false, all exchanges are given equal weight in the avg.
 // If exchange is invalid, a bool false is returned as a last return value.
-func (bot *ExchangeBot) processState(token, code string, states map[CurrencyPair]*ExchangeState, volumeAveraged bool) (float64, float64, bool) {
+func (bot *ExchangeBot) processState(token, code string, states map[CurrencyPair]*ExchangeState) (float64, float64, bool) {
 	oldestValid := time.Now().Add(-bot.RequestExpiry)
 	if bot.Exchanges[token].LastUpdate().Before(oldestValid) {
 		return 0, 0, false
 	}
 
 	var priceAccumulator, volSum float64
 	for currencyPair, state := range states {
-		volume := 1.0
-		if volumeAveraged {
-			volume = state.Volume
-		}
-		volSum += volume
-
 		// Convert price to bot.Index.
 		price := state.Price
 		switch currencyPair {
@@ -843,13 +836,13 @@ func (bot *ExchangeBot) processState(token, code string, states map[CurrencyPair
 		case CurrencyPairDCRUSDT:
 			price = bot.indexPrice(USDTIndex, code) * price
 		}
-		if price == 0 { // missing index price for currencyPair.
-			return 0, 0, false
+		if price == 0 {
+			continue // missing index price for currencyPair so let's skip this one.
 		}
 
-		priceAccumulator += volume * price
+		volSum += state.Volume
+		priceAccumulator += state.Volume * price
 	}
-
 	if volSum == 0 {
 		return 0, 0, true
 	}
@@ -927,7 +920,7 @@ func (bot *ExchangeBot) updateIndices(update *IndexUpdate) error {
 func (bot *ExchangeBot) dcrPriceAndVolume(code string) (float64, float64) {
 	var dcrPrice, volume, nSources float64
 	for token, xcStates := range bot.currentState.DCRExchanges {
-		processedDcrPrice, processedVolume, ok := bot.processState(token, code, xcStates, true)
+		processedDcrPrice, processedVolume, ok := bot.processState(token, code, xcStates)
 		if !ok {
 			continue
 		}

exchanges/exchanges.go

@@ -340,7 +340,7 @@ func (sticks Candlesticks) needsUpdate(bin candlestickKey) bool {
 type BaseState struct {
 	Price float64 `json:"price"`
 	// BaseVolume is poorly named. This is the volume in terms of (usually) BTC
-	// or USDT, not the base asset of any particular market.
+	// or USDT, not the base asset of any particular market. TODO: Rename.
 	BaseVolume float64 `json:"base_volume,omitempty"`
 	Volume     float64 `json:"volume,omitempty"`
 	Change     float64 `json:"change,omitempty"`
@@ -1985,7 +1985,7 @@ type KucoinPriceResponse struct {
 		VolValue    string `json:"volValue"`
 		Last        string `json:"last"`
 
-		// These are unsed fields, but left commented since they are part of the original schema.
+		// These are unused fields, but left commented since they are part of the original schema.
 		// Sequence    string `json:"sequence"`
 		// Buy              string `json:"buy"`
 		// Sell             string `json:"sell"`
@@ -2098,7 +2098,7 @@ func (r KucoinCandlestickResponse) translate() Candlesticks {
 type KucoinDepthResponse struct {
 	// Code string `json:"code"`
 	Data struct {
-		// These are unsed fields, but left commented since they are part of the original schema.
+		// These are unused fields, but left commented since they are part of the original schema.
 		// Time int64 `json:"time"` used
 		// Sequence string `json:"sequence"` used
 		Bids [][2]string
@@ -2235,7 +2235,7 @@ type CoinExPriceResponse struct {
 		Value  string `json:"value"`
 		Volume string `json:"volume"`
 
-		// These are unsed fields, but left commented since they are part of the
+		// These are unused fields, but left commented since they are part of the
 		// original schema.
 		// Market     string `json:"market"`
 		// Period     int64  `json:"period"`
@@ -2273,7 +2273,7 @@ type CoinExCandlestickResponse struct {
 		Open      string `json:"open"`
 		Volume    string `json:"volume"`
 
-		// These are unsed fields, but left commented since they are part of the
+		// These are unused fields, but left commented since they are part of the
 		// original schema.
 		// Market    string `json:"market"`
 		// Value     string `json:"value"`
@@ -2331,14 +2331,14 @@ type CoinExDepthResponse struct {
 			Asks [][2]string `json:"asks"`
 		} `json:"depth"`
 
-		// These are unsed fields, but left commented since they are part of the
+		// These are unused fields, but left commented since they are part of the
 		// original schema.
 		// Last      string `json:"last"`
 		// UpdatedAt int64  `json:"updated_at"`
 		// Checksum  string `json:"checksum"`
 	} `json:"data"`
 
-	// These are unsed fields, but left commented since they are part of the
+	// These are unused fields, but left commented since they are part of the
 	// original schema.
 	// IsFull bool   `json:"is_full"`
 	// Market string `json:"market"`