Skip to content

statedb.go: fix NoTries mode snapshot storage delete #3501

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
buddh0 merged 2 commits into from
Dec 24, 2025
+7 −2
Merged

statedb.go: fix NoTries mode snapshot storage delete #3501

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b492d4a
statedb.go: fix NoTries mode snapshot storage delete
zlacfzy Dec 24, 2025
7af3f81
statedb.go: fix NoTries mode snapshot storage delete
zlacfzy Dec 24, 2025
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
9 changes: 7 additions & 2 deletions core/state/statedb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,9 @@ func (s *StateDB) fastDeleteStorage(snaps *snapshot.Tree, addrHash common.Hash,
if err := iter.Error(); err != nil { // error might occur during iteration
return nil, nil, nil, err
}
if stack.Hash() != root {
// In NoTries mode, root is always EmptyRootHash (see updateRoot()),
// so we skip the hash verification. The snapshot is the source of truth.
if !s.db.NoTries() && stack.Hash() != root {
return nil, nil, nil, fmt.Errorf("snapshot is not matched, exp %x, got %x", root, stack.Hash())
}
return storages, storageOrigins, nodes, nil
Expand Down Expand Up @@ -1284,7 +1286,10 @@ func (s *StateDB) handleDestruction(noStorageWiping bool) (map[common.Hash]*acco
deletes[addrHash] = op

// Short circuit if the origin storage was empty.
if prev.Root == types.EmptyRootHash || s.db.TrieDB().IsVerkle() {
// In NoTries mode, prev.Root is always EmptyRootHash (see updateRoot()),
// so we cannot rely on it to determine if storage exists.
// We must try to delete storage via snapshot regardless.
if (!s.db.NoTries() && prev.Root == types.EmptyRootHash) || s.db.TrieDB().IsVerkle() {
continue
}
if noStorageWiping {
Expand Down