forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 10:50:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/state: avoid statedb.dbErr due to emptyCode #21051 (#1197)

Browse source
This commit is contained in:
Daniel Liu 2025-07-28 16:55:29 +08:00 committed by GitHub
parent cdd48dd4de
commit 2eac17980c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/state/statedb.go
View file

@ -18,6 +18,7 @@
package state package state
import ( import (
"bytes"
"fmt" "fmt"
"maps" "maps"
"math/big" "math/big"
@ -275,9 +276,12 @@ func (s *StateDB) GetCodeSize(addr common.Address) int {
if stateObject.code != nil { if stateObject.code != nil {
return len(stateObject.code) return len(stateObject.code)
} }
if bytes.Equal(stateObject.CodeHash(), types.EmptyCodeHash[:]) {
return 0
}
size, err := s.db.ContractCodeSize(stateObject.addrHash, common.BytesToHash(stateObject.CodeHash())) size, err := s.db.ContractCodeSize(stateObject.addrHash, common.BytesToHash(stateObject.CodeHash()))
if err != nil { if err != nil {
s.setError(err) s.setError(fmt.Errorf("GetCodeSize (%x) error: %v", addr[:], err))
} }
return size return size
} }
@ -487,7 +491,9 @@ func (s *StateDB) updateStateObject(obj *stateObject) {
if err != nil { if err != nil {
panic(fmt.Errorf("can't encode object at %x: %v", addr[:], err)) panic(fmt.Errorf("can't encode object at %x: %v", addr[:], err))
} }
s.setError(s.trie.TryUpdate(addr[:], data)) if err = s.trie.TryUpdate(addr[:], data); err != nil {
s.setError(fmt.Errorf("updateStateObject (%x) error: %v", addr[:], err))
}
} }
// deleteStateObject removes the given object from the state trie. // deleteStateObject removes the given object from the state trie.
@ -497,7 +503,9 @@ func (s *StateDB) deleteStateObject(obj *stateObject) {
// Delete the account from the trie // Delete the account from the trie
addr := obj.Address() addr := obj.Address()
s.setError(s.trie.TryDelete(addr[:])) if err := s.trie.TryDelete(addr[:]); err != nil {
s.setError(fmt.Errorf("deleteStateObject (%x) error: %v", addr[:], err))
}
} }
// DeleteAddress removes the address from the state trie. // DeleteAddress removes the address from the state trie.
@ -538,7 +546,6 @@ func (s *StateDB) getDeletedStateObject(addr common.Address) *stateObject {
return nil return nil
} }
if len(enc) == 0 { if len(enc) == 0 {
s.setError(err)
return nil return nil
} }
var data Account var data Account