Skip to content

core/state: fix handleDestruction for fast node #3519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allformless merged 1 commit into from
Jan 14, 2026
Merged

core/state: fix handleDestruction for fast node #3519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions core/state/statedb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,12 +1286,17 @@ func (s *StateDB) handleDestruction(noStorageWiping bool) (map[common.Hash]*acco
deletes[addrHash] = op

// Short circuit if the origin storage was empty.
//
// 1. Standard Trie: Reliable check via EmptyRootHash.
// 2. NoTries: Since Root is always EmptyRootHash (see updateRoot()),
// we rely on EIP-158 emptiness to skip storage cleanup for deleted empty accounts.
// 2. NoTries: Since `prev.Root` is always EmptyRootHash (refer to updateRoot()):
// a. EIP-158 is active from BSC genesis, ensuring that "empty accounts" are
// cleared upon finalization; thus, `prevObj.origin` is guaranteed to be nil.
// b. Post-Cancun (EIP-6780): If an EOA with balance is converted to a contract
// via CREATE/CREATE2 and then calls SELFDESTRUCT within the same transaction,
// we must honor 'noStorageWiping' to skip redundant or illegal disk deletion.
// 3. Verkle: Legacy trie-root based checks are inapplicable.
if (!s.db.NoTries() && prev.Root == types.EmptyRootHash) ||
/*(s.db.NoTries() && prevObj.empty()) ||*/ // EIP158 is true from the genesis block in BSC
if !s.db.NoTries() && prev.Root == types.EmptyRootHash ||
s.db.NoTries() && noStorageWiping ||
s.db.TrieDB().IsVerkle() {
continue
}
Expand Down