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

ethclient: fix panic when requesting missing blocks #26817 (#1375)

Browse source
This commit is contained in:
Daniel Liu 2025-08-22 16:46:55 +08:00 committed by GitHub
parent 9acddd1792
commit 0e6d2f4b94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ethclient/ethclient.go
View file

@ -125,15 +125,19 @@ func (ec *Client) getBlock(ctx context.Context, method string, args ...interface
err := ec.c.CallContext(ctx, &raw, method, args...) err := ec.c.CallContext(ctx, &raw, method, args...)
if err != nil { if err != nil {
return nil, err return nil, err
} else if len(raw) == 0 {
return nil, ethereum.ErrNotFound
} }
// Decode header and transactions. // Decode header and transactions.
var head *types.Header var head *types.Header
var body rpcBlock
if err := json.Unmarshal(raw, &head); err != nil { if err := json.Unmarshal(raw, &head); err != nil {
return nil, err return nil, err
} }
// When the block is not found, the API returns JSON null.
if head == nil {
return nil, ethereum.ErrNotFound
}
var body rpcBlock
if err := json.Unmarshal(raw, &body); err != nil { if err := json.Unmarshal(raw, &body); err != nil {
return nil, err return nil, err
} }