aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/chain_indexer.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/chain_indexer.go b/core/chain_indexer.go
index 4bdd4ba1c..28dc47668 100644
--- a/core/chain_indexer.go
+++ b/core/chain_indexer.go
@@ -219,13 +219,13 @@ func (c *ChainIndexer) eventLoop(currentHeader *types.Header, events chan ChainE
}
header := ev.Block.Header()
if header.ParentHash != prevHash {
- // Reorg to the common ancestor (might not exist in light sync mode, skip reorg then)
+ // Reorg to the common ancestor if needed (might not exist in light sync mode, skip reorg then)
// TODO(karalabe, zsfelfoldi): This seems a bit brittle, can we detect this case explicitly?
- // TODO(karalabe): This operation is expensive and might block, causing the event system to
- // potentially also lock up. We need to do with on a different thread somehow.
- if h := rawdb.FindCommonAncestor(c.chainDb, prevHeader, header); h != nil {
- c.newHead(h.Number.Uint64(), true)
+ if rawdb.ReadCanonicalHash(c.chainDb, prevHeader.Number.Uint64()) != prevHash {
+ if h := rawdb.FindCommonAncestor(c.chainDb, prevHeader, header); h != nil {
+ c.newHead(h.Number.Uint64(), true)
+ }
}
}
c.newHead(header.Number.Uint64(), false)