This commit is contained in:
Shbli 2017-12-27 17:06:19 +03:00
parent 9d187f0238
commit 0bba5ff394

View file

@ -20,6 +20,7 @@ import (
"context" "context"
"math/big" "math/big"
"errors"
"github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/common/math"
@ -90,6 +91,10 @@ func (b *EthApiBackend) StateAndHeaderByNumber(ctx context.Context, blockNr rpc.
// Otherwise resolve the block number and return its state // Otherwise resolve the block number and return its state
header, err := b.HeaderByNumber(ctx, blockNr) header, err := b.HeaderByNumber(ctx, blockNr)
if header == nil || err != nil { if header == nil || err != nil {
//if the error is nil, let's create a generic error message instead of returning a fully null result
if err == nil {
err = errors.New("blockchain header is nil")
}
return nil, nil, err return nil, nil, err
} }
stateDb, err := b.eth.BlockChain().StateAt(header.Root) stateDb, err := b.eth.BlockChain().StateAt(header.Root)