Adding correct miner address on API at the RPC level (POS-553)

consensus/bor/bor.go

@@ -288,6 +288,10 @@ func New(
 // Author implements consensus.Engine, returning the Ethereum address recovered
 // from the signature in the header's extra-data section.
 func (c *Bor) Author(header *types.Header) (common.Address, error) {
+	if header.Number.Uint64() == 0 {
+		add := common.HexToAddress("0x0000000000000000000000000000000000000000")
+		return add, nil
+	}
 	return ecrecover(header, c.signatures, c.config)
 }
 

consensus/clique/clique.go

@@ -210,6 +210,10 @@ func New(config *params.CliqueConfig, db ethdb.Database) *Clique {
 // Author implements consensus.Engine, returning the Ethereum address recovered
 // from the signature in the header's extra-data section.
 func (c *Clique) Author(header *types.Header) (common.Address, error) {
+	if header.Number.Uint64() == 0 {
+		add := common.HexToAddress("0x0000000000000000000000000000000000000000")
+		return add, nil
+	}
 	return ecrecover(header, c.signatures)
 }
 

internal/ethapi/api.go

@@ -814,6 +814,18 @@ func (s *PublicBlockChainAPI) GetHeaderByHash(ctx context.Context, hash common.H
 	return nil
 }
 
+// getAuthor: returns the author of the Block
+func (s *PublicBlockChainAPI) getAuthor(head *types.Header) (*common.Address, error) {
+	// get author using Author() function from: /consensus/clique/clique.go
+	// In Production: get author using Author() function from: /consensus/bor/bor.go
+	author, err := s.b.Engine().Author(head)
+	if err != nil {
+		return nil, err
+	}
+	// change the coinbase (0x0) with the miner address
+	return &author, nil
+}
+
 // GetBlockByNumber returns the requested canonical block.
 // * When blockNr is -1 the chain head is returned.
 // * When blockNr is -2 the pending chain head is returned.
@@ -822,6 +834,7 @@ func (s *PublicBlockChainAPI) GetHeaderByHash(ctx context.Context, hash common.H
 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 {
+
 		response, err := s.rpcMarshalBlock(ctx, block, true, fullTx)
 		if err == nil && number == rpc.PendingBlockNumber {
 			// Pending blocks need to nil out a few fields
@@ -830,6 +843,15 @@ 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)
@@ -848,6 +870,14 @@ func (s *PublicBlockChainAPI) GetBlockByHash(ctx context.Context, hash common.Ha
 		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