Merge pull request #180 from ProofSuite/v1.0.1

V1.0.1

Author: Dvisacker

services/info.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"log"
 	"math/big"
 	"time"
 
@@ -187,7 +188,10 @@ func (s *InfoService) GetExchangeStats() (*types.ExchangeStats, error) {
 		for _, t := range tradeData {
 			if t.AddressCode() == p.AddressCode() {
 				totalTrades = totalTrades + int(t.Count.Int64())
-				totalVolume = totalVolume + t.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+
+				if exchangeRate := rates[p.BaseTokenSymbol]; exchangeRate != 0 {
+					totalVolume = totalVolume + t.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+				}
 
 				pairTradeCounts[p.Name()] = int(t.Count.Int64())
 				tokenTradeCounts[p.BaseTokenSymbol] = tokenTradeCounts[p.BaseTokenSymbol] + int(t.Count.Int64())
@@ -197,15 +201,19 @@ func (s *InfoService) GetExchangeStats() (*types.ExchangeStats, error) {
 		for _, o := range bidsData {
 			if o.AddressCode() == p.AddressCode() {
 				// change and replace by equivalent dollar volume instead of order count
-				totalBuyOrderAmount = totalBuyOrderAmount + o.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+				if exchangeRate := rates[p.BaseTokenSymbol]; exchangeRate != 0 {
+					totalBuyOrderAmount = totalBuyOrderAmount + o.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+				}
 				totalBuyOrders = totalBuyOrders + int(o.OrderCount.Int64())
 			}
 		}
 
 		for _, o := range asksData {
 			if o.AddressCode() == p.AddressCode() {
 				// change and replace by equivalent dollar volume instead of order count
-				totalSellOrderAmount = totalSellOrderAmount + o.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+				if exchangeRate := rates[p.BaseTokenSymbol]; exchangeRate != 0 {
+					totalSellOrderAmount = totalSellOrderAmount + o.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+				}
 				totalSellOrders = totalSellOrders + int(o.OrderCount.Int64())
 			}
 		}
@@ -235,6 +243,8 @@ func (s *InfoService) GetExchangeStats() (*types.ExchangeStats, error) {
 		TradeSuccessRatio:    tradeSuccessRatio,
 	}
 
+	log.Printf("%+v\n", stats)
+
 	return stats, nil
 }
 
@@ -412,7 +422,10 @@ func (s *InfoService) GetExchangeData() (*types.ExchangeData, error) {
 				pairData.AverageTradeAmount = math.Div(t.Volume, t.Count)
 
 				totalTrades = totalTrades + int(t.Count.Int64())
-				totalVolume = totalVolume + t.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+
+				if exchangeRate := rates[p.BaseTokenSymbol]; exchangeRate != 0 {
+					totalVolume = totalVolume + t.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+				}
 
 				pairTradeCounts[p.Name()] = int(t.Count.Int64())
 				tokenTradeCounts[p.BaseTokenSymbol] = tokenTradeCounts[p.BaseTokenSymbol] + int(t.Count.Int64())
@@ -426,8 +439,10 @@ func (s *InfoService) GetExchangeData() (*types.ExchangeData, error) {
 				pairData.BidPrice = o.BestPrice
 				pairData.AverageOrderAmount = math.Div(pairData.OrderVolume, pairData.OrderCount)
 
-				// change and replace by equivalent dollar volume instead of order count
-				totalBuyOrderAmount = totalBuyOrderAmount + o.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+				if exchangeRate := rates[p.BaseTokenSymbol]; exchangeRate != 0 {
+					totalBuyOrderAmount = totalBuyOrderAmount + o.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+				}
+
 				totalBuyOrders = totalBuyOrders + int(o.OrderCount.Int64())
 			}
 		}
@@ -439,8 +454,10 @@ func (s *InfoService) GetExchangeData() (*types.ExchangeData, error) {
 				pairData.AskPrice = o.BestPrice
 				pairData.AverageOrderAmount = math.Div(pairData.OrderVolume, pairData.OrderCount)
 
-				// change and replace by equivalent dollar volume instead of order count
-				totalSellOrderAmount = totalSellOrderAmount + o.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+				if exchangeRate := rates[p.BaseTokenSymbol]; exchangeRate != 0 {
+					totalSellOrderAmount = totalSellOrderAmount + o.ConvertedVolume(&p, rates[p.BaseTokenSymbol])
+				}
+
 				totalSellOrders = totalSellOrders + int(o.OrderCount.Int64())
 
 				//TODO change price into orderbook price

start-local-rinkeby.sh

@@ -3,6 +3,6 @@ AMP_MONGODB_URL=localhost; \
 AMP_MONGODB_DBNAME=proofdex; \
 AMP_EXCHANGE_CONTRACT_ADDRESS=0x9c446449fbc378941586Ef7a2196B13CC12AEBcd; \
 AMP_ETHEREUM_NODE_HTTP_URL=https://rinkeby.infura.io; \
-AMP_ETHEREUM_NODE_WS_URL=wss://rinkeby.infura.io/_ws; \
+AMP_ETHEREUM_NODE_WS_URL=wss://rinkeby.infura.io/ws; \
 AMP_ENABLE_TLS=false; \
 fresh