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 1

ensure non-mutated storage slots are included in witness when snapshot is enabled

Browse source
This commit is contained in:
Jared Wasinger 2024-02-13 07:44:55 -08:00
parent 4943bd8bbb
commit 494ba791a1
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/state/statedb.go
View file

@ -921,14 +921,13 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
prefetcher := s.prefetcher prefetcher := s.prefetcher
if s.prefetcher != nil { if s.prefetcher != nil {
defer func() { defer func() {
// TODO: need to wait for read accounts to be resolved in prefetcher main trie? s.prefetcher.wait()
s.prefetcher.close()
if s.witness != nil { if s.witness != nil {
// TODO: move read prefetcher logic into Commit? // TODO: move read prefetcher logic into Commit?
s.collectReadStorageAccessLists() s.collectReadStorageAccessLists()
s.collectReadAccountsAccessLists() s.collectReadAccountsAccessLists()
} }
s.prefetcher.close()
s.prefetcher = nil s.prefetcher = nil
}() }()
} }

8
core/state/trie_prefetcher.go
View file

@ -210,6 +210,14 @@ func (sf *subfetcher) schedule(keys [][]byte) {
} }
} }
// wait instructs all subfetchers to finish their tasks
// and stop receiving new requests.
func (p *triePrefetcher) wait() {
for _, fetcher := range p.fetchers {
fetcher.wait()
}
}
// wait waits for the subfetcher to finish it's task. It is safe to call wait multiple // wait waits for the subfetcher to finish it's task. It is safe to call wait multiple
// times but it is not thread safe. // times but it is not thread safe.
func (sf *subfetcher) wait() { func (sf *subfetcher) wait() {