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

removed check from consensus, handelling everything in api.go

Browse source
This commit is contained in:
Pratik Patil 2022-06-28 21:03:36 +05:30
parent de03f3fb6a
commit 473e09cd2d
3 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
consensus/bor/bor.go
View file

@ -288,10 +288,6 @@ func New(
// Author implements consensus.Engine, returning the Ethereum address recovered // Author implements consensus.Engine, returning the Ethereum address recovered
// from the signature in the header's extra-data section. // from the signature in the header's extra-data section.
func (c *Bor) Author(header *types.Header) (common.Address, error) { 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) return ecrecover(header, c.signatures, c.config)
} }

4
consensus/clique/clique.go
View file

@ -210,10 +210,6 @@ func New(config *params.CliqueConfig, db ethdb.Database) *Clique {
// Author implements consensus.Engine, returning the Ethereum address recovered // Author implements consensus.Engine, returning the Ethereum address recovered
// from the signature in the header's extra-data section. // from the signature in the header's extra-data section.
func (c *Clique) Author(header *types.Header) (common.Address, error) { 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) return ecrecover(header, c.signatures)
} }

17
internal/ethapi/api.go
View file

@ -815,17 +815,17 @@ func (s *PublicBlockChainAPI) GetHeaderByHash(ctx context.Context, hash common.H
} }
// getAuthor: returns the author of the Block // getAuthor: returns the author of the Block
func (s *PublicBlockChainAPI) getAuthor(head *types.Header) (*common.Address, error) { func (s *PublicBlockChainAPI) getAuthor(head *types.Header) *common.Address {
// get author using Author() function from: /consensus/clique/clique.go // get author using Author() function from: /consensus/clique/clique.go
// In Production: get author using Author() function from: /consensus/bor/bor.go // In Production: get author using Author() function from: /consensus/bor/bor.go
author, err := s.b.Engine().Author(head) author, err := s.b.Engine().Author(head)
// make sure we don't send error to the user, return 0x0 instead // make sure we don't send error to the user, return 0x0 instead
if err != nil { if err != nil {
add := common.HexToAddress("0x0000000000000000000000000000000000000000") add := common.HexToAddress("0x0000000000000000000000000000000000000000")
return &add, nil return &add
} }
// change the coinbase (0x0) with the miner address // change the coinbase (0x0) with the miner address
return &author, nil return &author
} }
// GetBlockByNumber returns the requested canonical block. // GetBlockByNumber returns the requested canonical block.
@ -846,10 +846,7 @@ func (s *PublicBlockChainAPI) GetBlockByNumber(ctx context.Context, number rpc.B
} }
if err == nil && number != rpc.PendingBlockNumber { if err == nil && number != rpc.PendingBlockNumber {
author, err := s.getAuthor(block.Header()) author := s.getAuthor(block.Header())
if err != nil {
return nil, err
}
response["miner"] = author response["miner"] = author
} }
@ -872,11 +869,7 @@ func (s *PublicBlockChainAPI) GetBlockByHash(ctx context.Context, hash common.Ha
response, err := s.rpcMarshalBlock(ctx, block, true, fullTx) response, err := s.rpcMarshalBlock(ctx, block, true, fullTx)
// append marshalled bor transaction // append marshalled bor transaction
if err == nil && response != nil { if err == nil && response != nil {
author := s.getAuthor(block.Header())
author, err := s.getAuthor(block.Header())
if err != nil {
return nil, err
}
response["miner"] = author response["miner"] = author