core/evm: less iteration in blockhash

This commit is contained in:
Martin Holst Swende 2019-03-15 15:56:37 +01:00
parent c616dcf111
commit 3b7d48e881
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0

View file

@ -60,24 +60,33 @@ func NewEVMContext(msg Message, header *types.Header, chain ChainContext, author
// GetHashFn returns a GetHashFunc which retrieves header hashes by number // GetHashFn returns a GetHashFunc which retrieves header hashes by number
func GetHashFn(ref *types.Header, chain ChainContext) func(n uint64) common.Hash { func GetHashFn(ref *types.Header, chain ChainContext) func(n uint64) common.Hash {
var cache map[uint64]common.Hash
// Cache will initially contain [refHash.parent],
// Then fill up with [refHash.p, refHash.pp, refHash.ppp, ...]
var cache []common.Hash
return func(n uint64) common.Hash { return func(n uint64) common.Hash {
// If there's no hash cache yet, make one // If there's no hash cache yet, make one
if cache == nil { if len(cache) == 0 {
cache = map[uint64]common.Hash{ cache = append(cache, ref.ParentHash)
ref.Number.Uint64() - 1: ref.ParentHash,
} }
if idx := ref.Number.Uint64() - n - 1; idx < uint64(len(cache)) {
return cache[idx]
} }
// Try to fulfill the request from the cache // No luck in the cache, but we can start iterating from the last element we already know
if hash, ok := cache[n]; ok { lastKnownHash := cache[len(cache)-1]
return hash lastKnownNumber := ref.Number.Uint64() - uint64(len(cache))
for {
header := chain.GetHeader(lastKnownHash, lastKnownNumber)
if header == nil {
break
} }
// Not cached, iterate the blocks and cache the hashes cache = append(cache, header.ParentHash)
for header := chain.GetHeader(ref.ParentHash, ref.Number.Uint64()-1); header != nil; header = chain.GetHeader(header.ParentHash, header.Number.Uint64()-1) { lastKnownHash = header.ParentHash
cache[header.Number.Uint64()-1] = header.ParentHash lastKnownNumber = header.Number.Uint64() - 1
if n == header.Number.Uint64()-1 { if n == lastKnownNumber {
return header.ParentHash return lastKnownHash
} }
} }
return common.Hash{} return common.Hash{}