forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-28 15:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

minor fix

Browse source
This commit is contained in:
Pratik Patil 2022-06-22 12:13:43 +05:30
parent b3c02842b9
commit aec6d05255
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
internal/ethapi/api.go
View file

@ -814,16 +814,15 @@ func (s *PublicBlockChainAPI) GetHeaderByHash(ctx context.Context, hash common.H
return nil
}
// getHeaderWithAuthor: changes the miner (0x0, coinbase) with the original miner address
func (s *PublicBlockChainAPI) getHeaderWithAuthor(head *types.Header) error {
// getAuthor: returns the author of the Block
func (s *PublicBlockChainAPI) getAuthor(head *types.Header) (*common.Address, error) {
// get author using From: Backend -> Engine -> Author
author, err := s.b.Engine().Author(head)
if err != nil {
return err
return nil, err
}
// change the coinbase (0x0) with the miner address
head.Coinbase = author
return nil
return &author, nil
}
// GetBlockByNumber returns the requested canonical block.
@ -834,9 +833,7 @@ func (s *PublicBlockChainAPI) getHeaderWithAuthor(head *types.Header) error {
func (s *PublicBlockChainAPI) GetBlockByNumber(ctx context.Context, number rpc.BlockNumber, fullTx bool) (map[string]interface{}, error) {
block, err := s.b.BlockByNumber(ctx, number)
if block != nil && err == nil {
if err = s.getHeaderWithAuthor(block.Header()); err != nil {
return nil, err
}
response, err := s.rpcMarshalBlock(ctx, block, true, fullTx)
if err == nil && number == rpc.PendingBlockNumber {
// Pending blocks need to nil out a few fields
@ -845,6 +842,14 @@ func (s *PublicBlockChainAPI) GetBlockByNumber(ctx context.Context, number rpc.B
}
}
if err == nil && number != rpc.PendingBlockNumber {
author, err := s.getAuthor(block.Header())
if err != nil {
return nil, err
}
response["miner"] = author
}
// append marshalled bor transaction
if err == nil && response != nil {
response = s.appendRPCMarshalBorTransaction(ctx, block, response, fullTx)
@ -860,12 +865,16 @@ func (s *PublicBlockChainAPI) GetBlockByNumber(ctx context.Context, number rpc.B
func (s *PublicBlockChainAPI) GetBlockByHash(ctx context.Context, hash common.Hash, fullTx bool) (map[string]interface{}, error) {
block, err := s.b.BlockByHash(ctx, hash)
if block != nil {
if err = s.getHeaderWithAuthor(block.Header()); err != nil {
return nil, err
}
response, err := s.rpcMarshalBlock(ctx, block, true, fullTx)
// append marshalled bor transaction
if err == nil && response != nil {
author, err := s.getAuthor(block.Header())
if err != nil {
return nil, err
}
response["miner"] = author
return s.appendRPCMarshalBorTransaction(ctx, block, response, fullTx), err
}
return response, err