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

consensus/clique: fix race condition #24957

Merged
merged 2 commits into from
May 30, 2022
Merged

consensus/clique: fix race condition #24957

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f33614
consensus/clique: remove race condition
hkalodner May 25, 2022
03595bf
consensus/clique: fix one more signer data race
rjl493456442 May 26, 2022
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
18 changes: 12 additions & 6 deletions consensus/clique/clique.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ type Clique struct {

signer common.Address // Ethereum address of the signing key
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
fakeDiff bool // Skip difficulty verifications
Expand Down Expand Up @@ -507,9 +507,8 @@ func (c *Clique) Prepare(chain consensus.ChainHeaderReader, header *types.Header
if err != nil {
return err
}
c.lock.RLock()
if number%c.config.Epoch != 0 {
c.lock.RLock()

// Gather all the proposals that make sense voting on
addresses := make([]common.Address, 0, len(c.proposals))
for address, authorize := range c.proposals {
Expand All @@ -526,10 +525,14 @@ func (c *Clique) Prepare(chain consensus.ChainHeaderReader, header *types.Header
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
header.Difficulty = calcDifficulty(snap, c.signer)
header.Difficulty = calcDifficulty(snap, signer)

// Ensure the extra data has all its components
if len(header.Extra) < extraVanity {
Expand Down Expand Up @@ -666,7 +669,10 @@ func (c *Clique) CalcDifficulty(chain consensus.ChainHeaderReader, time uint64,
if err != 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 {
Expand Down