mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-05-15 12:36:48 +00:00
core/state: ensure deterministic hook emission order in Finalise (#33644)
Fixes #33630 Sort self-destructed addresses before emitting hooks in Finalise() to ensure deterministic ordering and fix flaky test TestHooks_OnCodeChangeV2. --------- Co-authored-by: jwasinger <j-wasinger@hotmail.com>
This commit is contained in:
parent
46d804776b
commit
2eb1ccc6c4
1 changed files with 14 additions and 1 deletions
|
|
@ -17,7 +17,9 @@
|
||||||
package state
|
package state
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"math/big"
|
"math/big"
|
||||||
|
"sort"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/common"
|
"github.com/ethereum/go-ethereum/common"
|
||||||
"github.com/ethereum/go-ethereum/core/stateless"
|
"github.com/ethereum/go-ethereum/core/stateless"
|
||||||
|
|
@ -234,13 +236,24 @@ func (s *hookedStateDB) Finalise(deleteEmptyObjects bool) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Iterate all dirty addresses and record self-destructs.
|
// Collect all self-destructed addresses first, then sort them to ensure
|
||||||
|
// that state change hooks will be invoked in deterministic
|
||||||
|
// order when the accounts are deleted below
|
||||||
|
var selfDestructedAddrs []common.Address
|
||||||
for addr := range s.inner.journal.dirties {
|
for addr := range s.inner.journal.dirties {
|
||||||
obj := s.inner.stateObjects[addr]
|
obj := s.inner.stateObjects[addr]
|
||||||
if obj == nil || !obj.selfDestructed {
|
if obj == nil || !obj.selfDestructed {
|
||||||
// Not self-destructed, keep searching.
|
// Not self-destructed, keep searching.
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
selfDestructedAddrs = append(selfDestructedAddrs, addr)
|
||||||
|
}
|
||||||
|
sort.Slice(selfDestructedAddrs, func(i, j int) bool {
|
||||||
|
return bytes.Compare(selfDestructedAddrs[i][:], selfDestructedAddrs[j][:]) < 0
|
||||||
|
})
|
||||||
|
|
||||||
|
for _, addr := range selfDestructedAddrs {
|
||||||
|
obj := s.inner.stateObjects[addr]
|
||||||
// Bingo: state object was self-destructed, call relevant hooks.
|
// Bingo: state object was self-destructed, call relevant hooks.
|
||||||
|
|
||||||
// If ether was sent to account post-selfdestruct, record as burnt.
|
// If ether was sent to account post-selfdestruct, record as burnt.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue