forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 09:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix nil pointer when block does not exist

Browse source
This commit is contained in:
mizuguchi_ef 2025-02-03 15:59:13 +09:00
parent 8daefeb890
commit 306eb6a72a
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
eth/api_backend.go
View file

@ -19,6 +19,7 @@ package eth
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"math/big" "math/big"
"time" "time"
@ -143,7 +144,11 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe
} }
return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil
} }
return b.eth.blockchain.GetBlockByNumber(uint64(number)), nil block := b.eth.blockchain.GetBlockByNumber(uint64(number))
if block == nil {
return nil, fmt.Errorf("block #%d not found", number)
}
return block, nil
} }
func (b *EthAPIBackend) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error) { func (b *EthAPIBackend) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error) {

3
eth/tracers/api.go
View file

@ -114,9 +114,6 @@ func (api *API) blockByNumber(ctx context.Context, number rpc.BlockNumber) (*typ
if err != nil { if err != nil {
return nil, err return nil, err
} }
if block == nil {
return nil, fmt.Errorf("block #%d not found", number)
}
return block, nil return block, nil
} }

6
internal/ethapi/api.go
View file

@ -1746,9 +1746,9 @@ func (api *DebugAPI) GetRawTransaction(ctx context.Context, hash common.Hash) (h
// PrintBlock retrieves a block and returns its pretty printed form. // PrintBlock retrieves a block and returns its pretty printed form.
func (api *DebugAPI) PrintBlock(ctx context.Context, number uint64) (string, error) { func (api *DebugAPI) PrintBlock(ctx context.Context, number uint64) (string, error) {
block, _ := api.b.BlockByNumber(ctx, rpc.BlockNumber(number)) block, err := api.b.BlockByNumber(ctx, rpc.BlockNumber(number))
if block == nil { if err != nil {
return "", fmt.Errorf("block #%d not found", number) return "", err
} }
return spew.Sdump(block), nil return spew.Sdump(block), nil
} }