aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-03-31 20:06:54 +0800
committerPéter Szilágyi <peterke@gmail.com>2017-03-31 20:06:54 +0800
commit96d1a4aee6c21b0cd247513cdd9d3acc78df378d (patch)
tree428de198945b2d2d25881c13df36a278db4dd146
parent105b37f1b4f77a50625dc997eaab9d71c52495df (diff)
downloaddexon-96d1a4aee6c21b0cd247513cdd9d3acc78df378d.tar
dexon-96d1a4aee6c21b0cd247513cdd9d3acc78df378d.tar.gz
dexon-96d1a4aee6c21b0cd247513cdd9d3acc78df378d.tar.bz2
dexon-96d1a4aee6c21b0cd247513cdd9d3acc78df378d.tar.lz
dexon-96d1a4aee6c21b0cd247513cdd9d3acc78df378d.tar.xz
dexon-96d1a4aee6c21b0cd247513cdd9d3acc78df378d.tar.zst
dexon-96d1a4aee6c21b0cd247513cdd9d3acc78df378d.zip
ethstats: sanity check ethstats history queries
-rw-r--r--ethstats/ethstats.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go
index 10f611c79..3ebbe3fc3 100644
--- a/ethstats/ethstats.go
+++ b/ethstats/ethstats.go
@@ -537,10 +537,16 @@ func (s *Service) reportHistory(conn *websocket.Conn, list []uint64) error {
// Gather the batch of blocks to report
history := make([]*blockStats, len(indexes))
for i, number := range indexes {
+ var block *types.Block
if s.eth != nil {
- history[len(history)-1-i] = s.assembleBlockStats(s.eth.BlockChain().GetBlockByNumber(number))
+ block = s.eth.BlockChain().GetBlockByNumber(number)
} else {
- history[len(history)-1-i] = s.assembleBlockStats(types.NewBlockWithHeader(s.les.BlockChain().GetHeaderByNumber(number)))
+ if header := s.les.BlockChain().GetHeaderByNumber(number); header != nil {
+ block = types.NewBlockWithHeader(header)
+ }
+ }
+ if block != nil {
+ history[len(history)-1-i] = s.assembleBlockStats(block)
}
}
// Assemble the history report and send it to the server