forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

verify masternode permission for signing

Browse source
This commit is contained in:
Tuna 2018-11-10 14:21:06 +07:00
parent b360290ded
commit 151f6b59b6
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/tomo/main.go
View file

@ -288,12 +288,12 @@ func startNode(ctx *cli.Context, stack *node.Node, cfg tomoConfig) {
if _, ok := ethereum.Engine().(*posv.Posv); ok { if _, ok := ethereum.Engine().(*posv.Posv); ok {
go func() { go func() {
started := false started := false
ok, err := ethereum.ValidateStaker() ok, err := ethereum.ValidateMasternode()
if err != nil { if err != nil {
utils.Fatalf("Can't verify validator permission: %v", err) utils.Fatalf("Can't verify masternode permission: %v", err)
} }
if ok { if ok {
log.Info("Validator found. Enabling staking mode...") log.Info("Masternode found. Enabling staking mode...")
// Use a reduced number of threads if requested // Use a reduced number of threads if requested
if threads := ctx.GlobalInt(utils.StakerThreadsFlag.Name); threads > 0 { if threads := ctx.GlobalInt(utils.StakerThreadsFlag.Name); threads > 0 {
type threaded interface { type threaded interface {
@ -314,7 +314,7 @@ func startNode(ctx *cli.Context, stack *node.Node, cfg tomoConfig) {
defer close(core.CheckpointCh) defer close(core.CheckpointCh)
for range core.CheckpointCh { for range core.CheckpointCh {
log.Info("Checkpoint!!! It's time to reconcile node's state...") log.Info("Checkpoint!!! It's time to reconcile node's state...")
ok, err := ethereum.ValidateStaker() ok, err := ethereum.ValidateMasternode()
if err != nil { if err != nil {
utils.Fatalf("Can't verify masternode permission: %v", err) utils.Fatalf("Can't verify masternode permission: %v", err)
} }

16
eth/backend.go
View file

@ -188,6 +188,14 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
if eth.chainConfig.Posv != nil { if eth.chainConfig.Posv != nil {
c := eth.engine.(*posv.Posv) c := eth.engine.(*posv.Posv)
signHook := func(block *types.Block) error { signHook := func(block *types.Block) error {
ok, err := eth.ValidateMasternode()
if err != nil {
return fmt.Errorf("Can't verify masternode permission: %v", err)
}
if !ok {
// silently return as this node doesn't have masternode permission to sign block
return nil
}
if err := contracts.CreateTransactionSign(chainConfig, eth.txPool, eth.accountManager, block, chainDb); err != nil { if err := contracts.CreateTransactionSign(chainConfig, eth.txPool, eth.accountManager, block, chainDb); err != nil {
return fmt.Errorf("Fail to create tx sign for importing block: %v", err) return fmt.Errorf("Fail to create tx sign for importing block: %v", err)
} }
@ -497,8 +505,8 @@ func (self *Ethereum) SetEtherbase(etherbase common.Address) {
self.miner.SetEtherbase(etherbase) self.miner.SetEtherbase(etherbase)
} }
// ValidateMiner checks if node's address is in set of validators // ValidateMasternode checks if node's address is in set of masternodes
func (s *Ethereum) ValidateStaker() (bool, error) { func (s *Ethereum) ValidateMasternode() (bool, error) {
eb, err := s.Etherbase() eb, err := s.Etherbase()
if err != nil { if err != nil {
return false, err return false, err
@ -508,14 +516,14 @@ func (s *Ethereum) ValidateStaker() (bool, error) {
c := s.engine.(*posv.Posv) c := s.engine.(*posv.Posv)
snap, err := c.GetSnapshot(s.blockchain, s.blockchain.CurrentHeader()) snap, err := c.GetSnapshot(s.blockchain, s.blockchain.CurrentHeader())
if err != nil { if err != nil {
return false, fmt.Errorf("Can't verify miner: %v", err) return false, fmt.Errorf("Can't verify masternode permission: %v", err)
} }
if _, authorized := snap.Signers[eb]; !authorized { if _, authorized := snap.Signers[eb]; !authorized {
//This miner doesn't belong to set of validators //This miner doesn't belong to set of validators
return false, nil return false, nil
} }
} else { } else {
return false, fmt.Errorf("Only verify miners in Posv protocol") return false, fmt.Errorf("Only verify masternode permission in PoSV protocol")
} }
return true, nil return true, nil
} }