consensus/istanbul: add block lock #127
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
markya0616
reviewed
Jul 18, 2017
|
|
||
| // HasBlock implements istanbul.Backend.HashBlock | ||
| func (sb *backend) HasBlock(hash common.Hash, number *big.Int) bool { | ||
| if h := sb.chain.GetHeaderByHash(hash); h != nil { |
There was a problem hiding this comment.
Use GetHeader and check block nil.
markya0616
reviewed
Jul 18, 2017
consensus/istanbul/core/core.go
Outdated
| // New snapshot for new round | ||
| c.current = newRoundState(newView, c.valSet) | ||
| // New snapshot for new round. roundChange value implies if locking block is necessary | ||
| c.updateRoundState(newView, c.valSet, roundChange) |
There was a problem hiding this comment.
We may update round state based on whether it's locked. no need roundChange
markya0616
reviewed
Jul 18, 2017
| if err := c.checkMessage(msgPreprepare, preprepare.View); err != nil { | ||
| if err == errOldMessage { | ||
| valSet := c.backend.Validators(preprepare.Proposal).Copy() |
markya0616
reviewed
Jul 18, 2017
consensus/istanbul/core/core.go
Outdated
| // If it is locked, propose the old proposal | ||
| if c.current.IsHashLocked() { | ||
| r := &istanbul.Request{ | ||
| Proposal: currentProposal, |
There was a problem hiding this comment.
Get current proposal from c.current.Prepare.Proposal
markya0616
reviewed
Jul 18, 2017
consensus/istanbul/core/prepare.go
Outdated
| // and we are in earlier state before StatePrepared | ||
| if c.current.Prepares.Size() > 2*c.valSet.F() && c.state.Cmp(StatePrepared) < 0 { | ||
| if c.current.IsHashLocked() || c.current.Prepares.Size() > 2*c.valSet.F() && c.state.Cmp(StatePrepared) < 0 { |
There was a problem hiding this comment.
(c.current.IsHashLocked() || c.current.Prepares.Size() > 2*c.valSet.F()) && c.state.Cmp(StatePrepared) < 0?
yutelin
force-pushed
the
feature/add-block-lock
branch
from
55d5ba9 to
7daa006
Compare
yutelin
changed the title
tailingchen
approved these changes
Jul 21, 2017
markya0616
pushed a commit
that referenced
this pull request
Jan 31, 2018
…ain backward compatibility (#127)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.