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

consensus/clique: fix race condition (#24957)

Browse Source 
* consensus/clique: remove race condition

* consensus/clique: fix one more signer data race

Co-authored-by: Gary Rong <garyrong0905@gmail.com>
This commit is contained in:
Harry Kalodner 2022-05-30 07:00:23 -04:00 committed by GitHub
parent a10660b7f8
commit 8845227306
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
consensus/clique/clique.go
View File

@ -180,7 +180,7 @@ type Clique struct {
signer common.Address // Ethereum address of the signing key signer common.Address // Ethereum address of the signing key
signFn SignerFn // Signer function to authorize hashes with signFn SignerFn // Signer function to authorize hashes with
lock sync.RWMutex // Protects the signer fields lock sync.RWMutex // Protects the signer and proposals fields
// The fields below are for testing only // The fields below are for testing only
fakeDiff bool // Skip difficulty verifications fakeDiff bool // Skip difficulty verifications
@ -507,9 +507,8 @@ func (c *Clique) Prepare(chain consensus.ChainHeaderReader, header *types.Header
if err != nil { if err != nil {
return err return err
} }
if number%c.config.Epoch != 0 {
c.lock.RLock() c.lock.RLock()
if number%c.config.Epoch != 0 {
// Gather all the proposals that make sense voting on // 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, authorize := range c.proposals { for address, authorize := range c.proposals {
@ -526,10 +525,14 @@ func (c *Clique) Prepare(chain consensus.ChainHeaderReader, header *types.Header
copy(header.Nonce[:], nonceDropVote) copy(header.Nonce[:], nonceDropVote)
} }
} }
c.lock.RUnlock()
} }
// Copy signer protected by mutex to avoid race condition
signer := c.signer
c.lock.RUnlock()
// Set the correct difficulty // Set the correct difficulty
header.Difficulty = calcDifficulty(snap, c.signer) header.Difficulty = calcDifficulty(snap, signer)
// Ensure the extra data has all its components // Ensure the extra data has all its components
if len(header.Extra) < extraVanity { if len(header.Extra) < extraVanity {
@ -666,7 +669,10 @@ func (c *Clique) CalcDifficulty(chain consensus.ChainHeaderReader, time uint64,
if err != nil { if err != nil {
return nil return nil
} }
return calcDifficulty(snap, c.signer) c.lock.RLock()
signer := c.signer
c.lock.RUnlock()
return calcDifficulty(snap, signer)
} }
func calcDifficulty(snap *Snapshot, signer common.Address) *big.Int { func calcDifficulty(snap *Snapshot, signer common.Address) *big.Int {