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

core/state, internal/ethapi: GetAccountInfo handle error properly, close XFN-79 (#1663)

Browse source
This commit is contained in:
Daniel Liu 2025-11-14 18:58:18 +08:00 committed by GitHub
parent 39b8184f57
commit 2c40021f71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/state/statedb.go
View file

@ -314,14 +314,18 @@ func (s *StateDB) GetAccountInfo(addr common.Address) *AccountInfo {
stateObject := s.getStateObject(addr) stateObject := s.getStateObject(addr)
if stateObject == nil { if stateObject == nil {
result.Balance = common.Big0 result.Balance = new(big.Int)
return &result return &result
} }
if stateObject.code != nil { if stateObject.code != nil {
result.CodeSize = len(stateObject.code) result.CodeSize = len(stateObject.code)
} else { } else {
result.CodeSize, _ = s.db.ContractCodeSize(stateObject.addrHash, common.BytesToHash(stateObject.CodeHash())) size, err := s.db.ContractCodeSize(stateObject.addrHash, common.BytesToHash(stateObject.CodeHash()))
if err != nil {
s.setError(err)
}
result.CodeSize = size
} }
result.Nonce = stateObject.Nonce() result.Nonce = stateObject.Nonce()
result.Balance = stateObject.Balance() result.Balance = stateObject.Balance()

2
internal/ethapi/api.go
View file

@ -509,7 +509,7 @@ func (api *BlockChainAPI) GetAccountInfo(ctx context.Context, address common.Add
"nonce": info.Nonce, "nonce": info.Nonce,
"storageHash": info.StorageHash, "storageHash": info.StorageHash,
} }
return result, nil return result, state.Error()
} }
// GetStorageAt returns the storage from the state at the given address, key and // GetStorageAt returns the storage from the state at the given address, key and