From c3e81107e5c2441f40d28bfe2e12832071bcc493 Mon Sep 17 00:00:00 2001
From: Liu Peng <36190809+TATAUFO@users.noreply.github.com>
Date: Tue, 13 Nov 2018 10:07:49 +0800
Subject: [PATCH] core: fix chain reorged if genesis parentHash not empty

If parentHash in genesis.json is set and not 0x0000... . When chain reorged , processSection will return error ""chain reorged during section processing"
---
 core/chain_indexer.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/chain_indexer.go b/core/chain_indexer.go
index 1adde1fcb4..a813d390b4 100644
--- a/core/chain_indexer.go
+++ b/core/chain_indexer.go
@@ -325,8 +325,13 @@ func (c *ChainIndexer) updateLoop() {
 				// Cache the current section count and head to allow unlocking the mutex
 				section := c.storedSections
 				var oldHead common.Hash
+				var initParent common.Hash
 				if section > 0 {
 					oldHead = c.SectionHead(section - 1)
+				} else if section == 0 {
+					hash := rawdb.ReadCanonicalHash(c.chainDb, 0)
+					initParent = rawdb.ReadHeader(c.chainDb, hash, 0).ParentHash
+					oldHead = initParent
 				}
 				// Process the newly defined section in the background
 				c.lock.Unlock()
@@ -343,7 +348,7 @@ func (c *ChainIndexer) updateLoop() {
 				c.lock.Lock()
 
 				// If processing succeeded and no reorgs occcurred, mark the section completed
-				if err == nil && oldHead == c.SectionHead(section-1) {
+				if err == nil && (section > 0 && oldHead == c.SectionHead(section-1) || (section == 0 && oldHead == initParent)) {
 					c.setSectionHead(section, newHead)
 					c.setValidSections(section + 1)
 					if c.storedSections == c.knownSections && updating {