Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

eth, internal/ethapi: make RPC block miner field show block sealer correctly #23312

Merged
merged 5 commits into from
Aug 17, 2021
Merged

eth, internal/ethapi: make RPC block miner field show block sealer correctly #23312

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51e443c
RPC API:The miner returned by Block is consensus.Engine.Author(block.…
chenjia404 Aug 1, 2021
54aebfa
Don't need this
chenjia404 Aug 1, 2021
465dcac
resolve the author field correctly in the RPCMarshalHeader function.
chenjia404 Aug 2, 2021
50e3b48
Delete the old way
chenjia404 Aug 2, 2021
044a92b
pass the consensus.Engine into the RPCMarshalBlock.
chenjia404 Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion internal/ethapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,7 @@ func FormatLogs(logs []vm.StructLog) []StructLogRes {

// RPCMarshalHeader converts the given header to the RPC output .
func RPCMarshalHeader(head *types.Header) map[string]interface{} {
miner, _ := Author(head)
result := map[string]interface{}{
"number": (*hexutil.Big)(head.Number),
"hash": head.Hash(),
Expand All @@ -1174,7 +1175,7 @@ func RPCMarshalHeader(head *types.Header) map[string]interface{} {
"sha3Uncles": head.UncleHash,
"logsBloom": head.Bloom,
"stateRoot": head.Root,
"miner": head.Coinbase,
"miner": miner,
"difficulty": (*hexutil.Big)(head.Difficulty),
"extraData": hexutil.Bytes(head.Extra),
"size": hexutil.Uint64(head.Size()),
Expand All @@ -1192,6 +1193,31 @@ func RPCMarshalHeader(head *types.Header) map[string]interface{} {
return result
}

// Author implements consensus.Engine, returning the Ethereum address recovered
// from the signature in the header's extra-data section.
func Author(header *types.Header) (common.Address, error) {
if header.Coinbase != common.HexToAddress("0x0") {
return header.Coinbase, nil
}
return ecrecover(header)
}

// ecrecover extracts the Ethereum account address from a signed header.
func ecrecover(header *types.Header) (common.Address, error) {
extraSeal := crypto.SignatureLength
signature := header.Extra[len(header.Extra)-extraSeal:]

// Recover the public key and the Ethereum address
pubkey, err := crypto.Ecrecover(clique.SealHash(header).Bytes(), signature)
if err != nil {
return common.Address{}, err
}
var signer common.Address
copy(signer[:], crypto.Keccak256(pubkey[1:])[12:])

return signer, nil
}

// RPCMarshalBlock converts the given block to the RPC output which depends on fullTx. If inclTx is true transactions are
// returned. When fullTx is true the returned block contains full transaction details, otherwise it will only contain
// transaction hashes.
Expand Down