From d731daf5669e4023acf531d956d1a37c49dd2e84 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Wed, 17 Aug 2022 13:14:49 +0200
Subject: [PATCH] core/state, trie, light: add a TryDeleteAccount method
 (#25531)

* core/state, trie, light: Add a DeleteAccount method

* review feedback

* Update database.go

* pr triage feedback

Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
---
 core/state/database.go | 3 +++
 core/state/statedb.go  | 2 +-
 light/trie.go          | 8 ++++++++
 trie/secure_trie.go    | 7 +++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/core/state/database.go b/core/state/database.go
index edbf78ae311a..96b6bcfe6551 100644
--- a/core/state/database.go
+++ b/core/state/database.go
@@ -87,6 +87,9 @@ type Trie interface {
 	// found in the database, a trie.MissingNodeError is returned.
 	TryDelete(key []byte) error
 
+	// TryDeleteAccount abstracts an account deletion from the trie.
+	TryDeleteAccount(key []byte) error
+
 	// Hash returns the root hash of the trie. It does not write to the database and
 	// can be used even if the trie doesn't have one.
 	Hash() common.Hash
diff --git a/core/state/statedb.go b/core/state/statedb.go
index cd388d6a3641..5c97dd94ade1 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -484,7 +484,7 @@ func (s *StateDB) deleteStateObject(obj *stateObject) {
 	}
 	// Delete the account from the trie
 	addr := obj.Address()
-	if err := s.trie.TryDelete(addr[:]); err != nil {
+	if err := s.trie.TryDeleteAccount(addr[:]); err != nil {
 		s.setError(fmt.Errorf("deleteStateObject (%x) error: %v", addr[:], err))
 	}
 }
diff --git a/light/trie.go b/light/trie.go
index 5755e2cc1959..f60edaa3b177 100644
--- a/light/trie.go
+++ b/light/trie.go
@@ -153,6 +153,14 @@ func (t *odrTrie) TryDelete(key []byte) error {
 	})
 }
 
+// TryDeleteACcount abstracts an account deletion from the trie.
+func (t *odrTrie) TryDeleteAccount(key []byte) error {
+	key = crypto.Keccak256(key)
+	return t.do(key, func() error {
+		return t.trie.TryDelete(key)
+	})
+}
+
 func (t *odrTrie) Commit(collectLeaf bool) (common.Hash, *trie.NodeSet, error) {
 	if t.trie == nil {
 		return t.id.Root, nil, nil
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
index 28b3473c011f..3d468f56ee0a 100644
--- a/trie/secure_trie.go
+++ b/trie/secure_trie.go
@@ -189,6 +189,13 @@ func (t *StateTrie) TryDelete(key []byte) error {
 	return t.trie.TryDelete(hk)
 }
 
+// TryDeleteACcount abstracts an account deletion from the trie.
+func (t *StateTrie) TryDeleteAccount(key []byte) error {
+	hk := t.hashKey(key)
+	delete(t.getSecKeyCache(), string(hk))
+	return t.trie.TryDelete(hk)
+}
+
 // GetKey returns the sha3 preimage of a hashed key that was
 // previously used to store a value.
 func (t *StateTrie) GetKey(shaKey []byte) []byte {