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

correct accumulation of usedAddrs in IntermediateRoot

Browse source
This commit is contained in:
Jared Wasinger 2024-03-08 06:31:18 -08:00
parent 9373700e0c
commit c37d1a75e9
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/state/statedb.go
View file

@ -900,26 +900,24 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
// //
// Consider nodes `A` and `B` who share the same full node parent `P` and have no other siblings. // Consider nodes `A` and `B` who share the same full node parent `P` and have no other siblings.
// During the execution of a block: // During the execution of a block:
// - `A` self-destructs, // - `A` self-destructs,
// - `C` is created, and also shares the parent `P`. // - `C` is created, and also shares the parent `P`.
// If the self-destruct is handled first, then `P` would be left with only one child, thus collapsed // If the self-destruct is handled first, then `P` would be left with only one child, thus collapsed
// into a shortnode. This requires `B` to be resolved from disk. // into a shortnode. This requires `B` to be resolved from disk.
// Whereas if the created node is handled first, then the collapse is avoided, and `B` is not resolved. // Whereas if the created node is handled first, then the collapse is avoided, and `B` is not resolved.
var deletedObjects []*stateObject var deletedObjects []*stateObject
for addr := range s.stateObjectsPending { for addr := range s.stateObjectsPending {
if obj := s.stateObjects[addr]; !obj.deleted { if obj := s.stateObjects[addr]; !obj.deleted {
s.updateStateObject(obj) s.updateStateObject(obj)
s.AccountUpdated += 1 s.AccountUpdated += 1
usedAddrs = append(usedAddrs, common.CopyBytes(addr[:])) // Copy needed for closure
} else { } else {
deletedObjects = append(deletedObjects, obj) deletedObjects = append(deletedObjects, obj)
} }
usedAddrs = append(usedAddrs, common.CopyBytes(addr[:])) usedAddrs = append(usedAddrs, common.CopyBytes(addr[:])) // Copy needed for closure
} }
for _, deletedObj := range deletedObjects { for _, deletedObj := range deletedObjects {
s.deleteStateObject(deletedObj) s.deleteStateObject(deletedObj)
s.AccountDeleted += 1 s.AccountDeleted += 1
usedAddrs = append(usedAddrs, common.CopyBytes(deletedObj.address[:])) // Copy needed for closure
} }
if prefetcher != nil { if prefetcher != nil {
prefetcher.used(common.Hash{}, s.originalRoot, usedAddrs) prefetcher.used(common.Hash{}, s.originalRoot, usedAddrs)