Fix syncing issue, init db with genesis manifest. Remove genesis chec…

…k in headerchain:Append.
Flyman110 · Jun 15, 2023 · 927e152 · 927e152
1 parent d36708f
commit 927e152
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/core/headerchain.go b/core/headerchain.go
@@ -272,14 +272,12 @@ func (hc *HeaderChain) Append(batch ethdb.Batch, block *types.Block, newInboundE
 	// coincident with a higher order chain. So, this check is skipped for prime
 	// nodes.
 	if nodeCtx > common.PRIME_CTX {
-		if block.ParentHash() != hc.config.GenesisHash {
-			manifest := rawdb.ReadManifest(hc.headerDb, block.ParentHash())
-			if manifest == nil {
-				return errors.New("manifest not found for parent")
-			}
-			if block.ManifestHash(nodeCtx) != types.DeriveSha(manifest, trie.NewStackTrie(nil)) {
-				return errors.New("manifest does not match hash")
-			}
+		manifest := rawdb.ReadManifest(hc.headerDb, block.ParentHash())
+		if manifest == nil {
+			return errors.New("manifest not found for parent")
+		}
+		if block.ManifestHash(nodeCtx) != types.DeriveSha(manifest, trie.NewStackTrie(nil)) {
+			return errors.New("manifest does not match hash")
 		}
 	}
 	elapsedCollectBlockManifest := common.PrettyDuration(time.Since(collectBlockManifest))

diff --git a/core/slice.go b/core/slice.go
@@ -645,6 +645,7 @@ func (sl *Slice) init(genesis *Genesis) error {
 		// Initialize slice state for genesis knot
 		genesisTermini := []common.Hash{genesisHash, genesisHash, genesisHash, genesisHash}
 		rawdb.WriteTermini(sl.sliceDb, genesisHash, genesisTermini)
+		rawdb.WriteManifest(sl.sliceDb, genesisHash, types.BlockManifest{genesisHash})
 
 		// Append each of the knot blocks
 		sl.bestPhKey = genesisHash