Merge remote-tracking branch 'origin/develop' into v2.3.4-candidate

Author: lucca30

core/blockchain_insert.go

@@ -29,7 +29,6 @@ import (
 type insertStats struct {
 	queued, processed, ignored int
 	usedGas                    uint64
-	lastIndex                  int
 	startTime                  mclock.AbsTime
 }
 
@@ -48,9 +47,9 @@ func (st *insertStats) report(chain []*types.Block, index int, snapDiffItems, sn
 	)
 	// If we're at the last block of the batch or report period reached, log
 	if index == len(chain)-1 || elapsed >= statsReportLimit {
-		// Count the number of transactions in this segment
+		// Count the number of transactions processed in this segment
 		var txs int
-		for _, block := range chain[st.lastIndex : index+1] {
+		for _, block := range chain[(index+1)-st.processed : index+1] {
 			txs += len(block.Transactions())
 		}
 
@@ -94,7 +93,7 @@ func (st *insertStats) report(chain []*types.Block, index int, snapDiffItems, sn
 			}
 		}
 		// Bump the stats reported to the next section
-		*st = insertStats{startTime: now, lastIndex: index + 1}
+		*st = insertStats{startTime: now}
 	}
 }