forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-11 14:33:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cherry-pick changes from develop (#738)

Browse source 
* Check if block is nil to prevent panic (#736)

* miner: use env for tracing instead of block object (#728)

---------

Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com>
This commit is contained in:
Manav Darji 2023-02-14 15:37:59 +05:30 committed by GitHub
parent 22fa4033e8
commit d9cc2187b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/ethapi/api.go
View file

@ -631,6 +631,10 @@ func (s *PublicBlockChainAPI) GetTransactionReceiptsByBlock(ctx context.Context,
return nil, err return nil, err
} }
if block == nil {
return nil, errors.New("block not found")
}
receipts, err := s.b.GetReceipts(ctx, block.Hash()) receipts, err := s.b.GetReceipts(ctx, block.Hash())
if err != nil { if err != nil {
return nil, err return nil, err

6
miner/worker.go
View file

@ -1314,9 +1314,9 @@ func (w *worker) commit(ctx context.Context, env *environment, interval func(),
tracing.SetAttributes( tracing.SetAttributes(
span, span,
attribute.Int("number", int(block.Number().Uint64())), attribute.Int("number", int(env.header.Number.Uint64())),
attribute.String("hash", block.Hash().String()), attribute.String("hash", env.header.Hash().String()),
attribute.String("sealhash", w.engine.SealHash(block.Header()).String()), attribute.String("sealhash", w.engine.SealHash(env.header).String()),
attribute.Int("len of env.txs", len(env.txs)), attribute.Int("len of env.txs", len(env.txs)),
attribute.Bool("error", err != nil), attribute.Bool("error", err != nil),
) )