consensus/clique: implement getSigner API method (#22987)
* clique: implement getSignerForBlock * consensus/clique: use blockNrOrHash in getSignerForBlock * consensus/clique: implement getSigner * consensus/clique: fixed rlp decoding * consensus/clique: use Author instead of getSigner * consensus/clique: nit nit nit * consensus/clique: nit nit nit
This commit is contained in:
parent
c49e065fea
commit
b9e6e43722
@ -17,11 +17,14 @@
|
|||||||
package clique
|
package clique
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/common"
|
"github.com/ethereum/go-ethereum/common"
|
||||||
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
||||||
"github.com/ethereum/go-ethereum/consensus"
|
"github.com/ethereum/go-ethereum/consensus"
|
||||||
"github.com/ethereum/go-ethereum/core/types"
|
"github.com/ethereum/go-ethereum/core/types"
|
||||||
|
"github.com/ethereum/go-ethereum/rlp"
|
||||||
"github.com/ethereum/go-ethereum/rpc"
|
"github.com/ethereum/go-ethereum/rpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -175,3 +178,51 @@ func (api *API) Status() (*status, error) {
|
|||||||
NumBlocks: numBlocks,
|
NumBlocks: numBlocks,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type blockNumberOrHashOrRLP struct {
|
||||||
|
*rpc.BlockNumberOrHash
|
||||||
|
RLP hexutil.Bytes `json:"rlp,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sb *blockNumberOrHashOrRLP) UnmarshalJSON(data []byte) error {
|
||||||
|
bnOrHash := new(rpc.BlockNumberOrHash)
|
||||||
|
// Try to unmarshal bNrOrHash
|
||||||
|
if err := bnOrHash.UnmarshalJSON(data); err == nil {
|
||||||
|
sb.BlockNumberOrHash = bnOrHash
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Try to unmarshal RLP
|
||||||
|
var input string
|
||||||
|
if err := json.Unmarshal(data, &input); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
sb.RLP = hexutil.MustDecode(input)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSigner returns the signer for a specific clique block.
|
||||||
|
// Can be called with either a blocknumber, blockhash or an rlp encoded blob.
|
||||||
|
// The RLP encoded blob can either be a block or a header.
|
||||||
|
func (api *API) GetSigner(rlpOrBlockNr *blockNumberOrHashOrRLP) (common.Address, error) {
|
||||||
|
if len(rlpOrBlockNr.RLP) == 0 {
|
||||||
|
blockNrOrHash := rlpOrBlockNr.BlockNumberOrHash
|
||||||
|
var header *types.Header
|
||||||
|
if blockNrOrHash == nil {
|
||||||
|
header = api.chain.CurrentHeader()
|
||||||
|
} else if hash, ok := blockNrOrHash.Hash(); ok {
|
||||||
|
header = api.chain.GetHeaderByHash(hash)
|
||||||
|
} else if number, ok := blockNrOrHash.Number(); ok {
|
||||||
|
header = api.chain.GetHeaderByNumber(uint64(number.Int64()))
|
||||||
|
}
|
||||||
|
return api.clique.Author(header)
|
||||||
|
}
|
||||||
|
block := new(types.Block)
|
||||||
|
if err := rlp.DecodeBytes(rlpOrBlockNr.RLP, block); err == nil {
|
||||||
|
return api.clique.Author(block.Header())
|
||||||
|
}
|
||||||
|
header := new(types.Header)
|
||||||
|
if err := rlp.DecodeBytes(rlpOrBlockNr.RLP, header); err != nil {
|
||||||
|
return common.Address{}, err
|
||||||
|
}
|
||||||
|
return api.clique.Author(header)
|
||||||
|
}
|
||||||
|
@ -108,6 +108,12 @@ web3._extend({
|
|||||||
call: 'clique_status',
|
call: 'clique_status',
|
||||||
params: 0
|
params: 0
|
||||||
}),
|
}),
|
||||||
|
new web3._extend.Method({
|
||||||
|
name: 'getSigner',
|
||||||
|
call: 'clique_getSigner',
|
||||||
|
params: 1,
|
||||||
|
inputFormatter: [null]
|
||||||
|
}),
|
||||||
],
|
],
|
||||||
properties: [
|
properties: [
|
||||||
new web3._extend.Property({
|
new web3._extend.Property({
|
||||||
|
Loading…
Reference in New Issue
Block a user