roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #14596 from markya0616/valid_clique_vote

Browse Source 
consensus/clique: choose valid votes
This commit is contained in:
Péter Szilágyi 2017-06-23 11:21:38 +03:00 committed by GitHub
commit cd88f69715
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
consensus/clique/clique.go
View File

@ -503,13 +503,24 @@ func (c *Clique) Prepare(chain consensus.ChainReader, header *types.Header) erro
header.Nonce = types.BlockNonce{} header.Nonce = types.BlockNonce{}
number := header.Number.Uint64() number := header.Number.Uint64()
// Assemble the voting snapshot to check which votes make sense
snap, err := c.snapshot(chain, number-1, header.ParentHash, nil)
if err != nil {
return err
}
if number%c.config.Epoch != 0 { if number%c.config.Epoch != 0 {
c.lock.RLock() c.lock.RLock()
if len(c.proposals) > 0 {
// Gather all the proposals that make sense voting on
addresses := make([]common.Address, 0, len(c.proposals)) addresses := make([]common.Address, 0, len(c.proposals))
for address := range c.proposals { for address, authorize := range c.proposals {
if snap.validVote(address, authorize) {
addresses = append(addresses, address) addresses = append(addresses, address)
} }
}
// If there's pending proposals, cast a vote on them
if len(addresses) > 0 {
header.Coinbase = addresses[rand.Intn(len(addresses))] header.Coinbase = addresses[rand.Intn(len(addresses))]
if c.proposals[header.Coinbase] { if c.proposals[header.Coinbase] {
copy(header.Nonce[:], nonceAuthVote) copy(header.Nonce[:], nonceAuthVote)
@ -519,11 +530,7 @@ func (c *Clique) Prepare(chain consensus.ChainReader, header *types.Header) erro
} }
c.lock.RUnlock() c.lock.RUnlock()
} }
// Assemble the voting snapshot and set the correct difficulty // Set the correct difficulty
snap, err := c.snapshot(chain, number-1, header.ParentHash, nil)
if err != nil {
return err
}
header.Difficulty = diffNoTurn header.Difficulty = diffNoTurn
if snap.inturn(header.Number.Uint64(), c.signer) { if snap.inturn(header.Number.Uint64(), c.signer) {
header.Difficulty = diffInTurn header.Difficulty = diffInTurn

10
consensus/clique/snapshot.go
View File

@ -126,11 +126,17 @@ func (s *Snapshot) copy() *Snapshot {
return cpy return cpy
} }
// validVote returns whether it makes sense to cast the specified vote in the
// given snapshot context (e.g. don't try to add an already authorized signer).
func (s *Snapshot) validVote(address common.Address, authorize bool) bool {
_, signer := s.Signers[address]
return (signer && !authorize) || (!signer && authorize)
}
// cast adds a new vote into the tally. // cast adds a new vote into the tally.
func (s *Snapshot) cast(address common.Address, authorize bool) bool { func (s *Snapshot) cast(address common.Address, authorize bool) bool {
// Ensure the vote is meaningful // Ensure the vote is meaningful
_, signer := s.Signers[address] if !s.validVote(address, authorize) {
if (signer && authorize) || (!signer && !authorize) {
return false return false
} }
// Cast the vote into an existing or new tally // Cast the vote into an existing or new tally