forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/rawdb: ensure correct hash when loading block body from ancient

Browse source
This commit is contained in:
Martin Holst Swende 2019-10-22 10:26:20 +02:00
parent 538f763fdc
commit 6d6de90cfb
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/rawdb/accessors_chain.go
View file

@ -249,20 +249,32 @@ func deleteHeaderWithoutNumber(db ethdb.KeyValueWriter, hash common.Hash, number
}
}
// readBodyRLPFromAncient tries to read the rlp body from ancients, also reading the
// hash to ensure that we read out the correct body
func readBodyRLPFromAncient(db ethdb.Reader, hash common.Hash, number uint64) rlp.RawValue {
data, _ := db.Ancient(freezerBodiesTable, number)
foundHash, _ := db.Ancient(freezerHashTable, number)
if len(data) != 0 && len(foundHash) != 0 {
if common.BytesToHash(foundHash) == hash {
return data
}
}
return nil
}
// ReadBodyRLP retrieves the block body (transactions and uncles) in RLP encoding.
func ReadBodyRLP(db ethdb.Reader, hash common.Hash, number uint64) rlp.RawValue {
data, _ := db.Ancient(freezerBodiesTable, number)
if len(data) == 0 {
data, _ = db.Get(blockBodyKey(number, hash))
if data := readBodyRLPFromAncient(db, hash, number); len(data) != 0 {
return data
}
if data, _ := db.Get(blockBodyKey(number, hash)); len(data) != 0 {
return data
}
// In the background freezer is moving data from leveldb to flatten files.
// So during the first check for ancient db, the data is not yet in there,
// but when we reach into leveldb, the data was already moved. That would
// result in a not found error.
if len(data) == 0 {
data, _ = db.Ancient(freezerBodiesTable, number)
}
}
return data
return readBodyRLPFromAncient(db, hash, number)
}
// WriteBodyRLP stores an RLP encoded block body into the database.
@ -274,7 +286,7 @@ func WriteBodyRLP(db ethdb.KeyValueWriter, hash common.Hash, number uint64, rlp
// HasBody verifies the existence of a block body corresponding to the hash.
func HasBody(db ethdb.Reader, hash common.Hash, number uint64) bool {
if has, err := db.Ancient(freezerHashTable, number); err == nil && common.BytesToHash(has) == hash {
if ourHash, err := db.Ancient(freezerHashTable, number); err == nil && common.BytesToHash(ourHash) == hash {
return true
}
if has, err := db.Has(blockBodyKey(number, hash)); !has || err != nil {