Merge pull request #19628 from karalabe/nofreeze-genesis

core/rawdb: keep genesis in key-value store for full sync too
This commit is contained in:
Péter Szilágyi 2019-05-27 13:02:37 +03:00 committed by GitHub
commit db0cc211f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -335,8 +335,11 @@ func (f *freezer) freeze(db ethdb.KeyValueStore) {
// Wipe out all data from the active database // Wipe out all data from the active database
batch := db.NewBatch() batch := db.NewBatch()
for i := 0; i < len(ancients); i++ { for i := 0; i < len(ancients); i++ {
DeleteBlockWithoutNumber(batch, ancients[i], first+uint64(i)) // Always keep the genesis block in active database
DeleteCanonicalHash(batch, first+uint64(i)) if first+uint64(i) != 0 {
DeleteBlockWithoutNumber(batch, ancients[i], first+uint64(i))
DeleteCanonicalHash(batch, first+uint64(i))
}
} }
if err := batch.Write(); err != nil { if err := batch.Write(); err != nil {
log.Crit("Failed to delete frozen canonical blocks", "err", err) log.Crit("Failed to delete frozen canonical blocks", "err", err)
@ -344,8 +347,11 @@ func (f *freezer) freeze(db ethdb.KeyValueStore) {
batch.Reset() batch.Reset()
// Wipe out side chain also. // Wipe out side chain also.
for number := first; number < f.frozen; number++ { for number := first; number < f.frozen; number++ {
for _, hash := range ReadAllHashes(db, number) { // Always keep the genesis block in active database
DeleteBlock(batch, hash, number) if number != 0 {
for _, hash := range ReadAllHashes(db, number) {
DeleteBlock(batch, hash, number)
}
} }
} }
if err := batch.Write(); err != nil { if err := batch.Write(); err != nil {