|
|
@ -934,7 +934,6 @@ func (cs *State) receiveRoutine(ctx context.Context, maxSteps int) { |
|
|
|
func (cs *State) handleMsg(ctx context.Context, mi msgInfo) { |
|
|
|
cs.mtx.Lock() |
|
|
|
defer cs.mtx.Unlock() |
|
|
|
|
|
|
|
var ( |
|
|
|
added bool |
|
|
|
err error |
|
|
@ -951,6 +950,24 @@ func (cs *State) handleMsg(ctx context.Context, mi msgInfo) { |
|
|
|
case *BlockPartMessage: |
|
|
|
// if the proposal is complete, we'll enterPrevote or tryFinalizeCommit
|
|
|
|
added, err = cs.addProposalBlockPart(ctx, msg, peerID) |
|
|
|
|
|
|
|
// We unlock here to yield to any routines that need to read the the RoundState.
|
|
|
|
// Previously, this code held the lock from the point at which the final block
|
|
|
|
// part was received until the block executed against the application.
|
|
|
|
// This prevented the reactor from being able to retrieve the most updated
|
|
|
|
// version of the RoundState. The reactor needs the updated RoundState to
|
|
|
|
// gossip the now completed block.
|
|
|
|
//
|
|
|
|
// This code can be further improved by either always operating on a copy
|
|
|
|
// of RoundState and only locking when switching out State's copy of
|
|
|
|
// RoundState with the updated copy or by emitting RoundState events in
|
|
|
|
// more places for routines depending on it to listen for.
|
|
|
|
cs.mtx.Unlock() |
|
|
|
|
|
|
|
cs.mtx.Lock() |
|
|
|
if added && cs.ProposalBlockParts.IsComplete() { |
|
|
|
cs.handleCompleteProposal(ctx, msg.Height) |
|
|
|
} |
|
|
|
if added { |
|
|
|
select { |
|
|
|
case cs.statsMsgQueue <- mi: |
|
|
@ -2153,44 +2170,43 @@ func (cs *State) addProposalBlockPart( |
|
|
|
if err := cs.eventBus.PublishEventCompleteProposal(ctx, cs.CompleteProposalEvent()); err != nil { |
|
|
|
cs.logger.Error("failed publishing event complete proposal", "err", err) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// Update Valid* if we can.
|
|
|
|
prevotes := cs.Votes.Prevotes(cs.Round) |
|
|
|
blockID, hasTwoThirds := prevotes.TwoThirdsMajority() |
|
|
|
if hasTwoThirds && !blockID.IsNil() && (cs.ValidRound < cs.Round) { |
|
|
|
if cs.ProposalBlock.HashesTo(blockID.Hash) { |
|
|
|
cs.logger.Debug( |
|
|
|
"updating valid block to new proposal block", |
|
|
|
"valid_round", cs.Round, |
|
|
|
"valid_block_hash", cs.ProposalBlock.Hash(), |
|
|
|
) |
|
|
|
return added, nil |
|
|
|
} |
|
|
|
func (cs *State) handleCompleteProposal(ctx context.Context, height int64) { |
|
|
|
// Update Valid* if we can.
|
|
|
|
prevotes := cs.Votes.Prevotes(cs.Round) |
|
|
|
blockID, hasTwoThirds := prevotes.TwoThirdsMajority() |
|
|
|
if hasTwoThirds && !blockID.IsNil() && (cs.ValidRound < cs.Round) { |
|
|
|
if cs.ProposalBlock.HashesTo(blockID.Hash) { |
|
|
|
cs.logger.Debug( |
|
|
|
"updating valid block to new proposal block", |
|
|
|
"valid_round", cs.Round, |
|
|
|
"valid_block_hash", cs.ProposalBlock.Hash(), |
|
|
|
) |
|
|
|
|
|
|
|
cs.ValidRound = cs.Round |
|
|
|
cs.ValidBlock = cs.ProposalBlock |
|
|
|
cs.ValidBlockParts = cs.ProposalBlockParts |
|
|
|
} |
|
|
|
// TODO: In case there is +2/3 majority in Prevotes set for some
|
|
|
|
// block and cs.ProposalBlock contains different block, either
|
|
|
|
// proposer is faulty or voting power of faulty processes is more
|
|
|
|
// than 1/3. We should trigger in the future accountability
|
|
|
|
// procedure at this point.
|
|
|
|
cs.ValidRound = cs.Round |
|
|
|
cs.ValidBlock = cs.ProposalBlock |
|
|
|
cs.ValidBlockParts = cs.ProposalBlockParts |
|
|
|
} |
|
|
|
// TODO: In case there is +2/3 majority in Prevotes set for some
|
|
|
|
// block and cs.ProposalBlock contains different block, either
|
|
|
|
// proposer is faulty or voting power of faulty processes is more
|
|
|
|
// than 1/3. We should trigger in the future accountability
|
|
|
|
// procedure at this point.
|
|
|
|
} |
|
|
|
|
|
|
|
if cs.Step <= cstypes.RoundStepPropose && cs.isProposalComplete() { |
|
|
|
// Move onto the next step
|
|
|
|
cs.enterPrevote(ctx, height, cs.Round) |
|
|
|
if hasTwoThirds { // this is optimisation as this will be triggered when prevote is added
|
|
|
|
cs.enterPrecommit(ctx, height, cs.Round) |
|
|
|
} |
|
|
|
} else if cs.Step == cstypes.RoundStepCommit { |
|
|
|
// If we're waiting on the proposal block...
|
|
|
|
cs.tryFinalizeCommit(ctx, height) |
|
|
|
if cs.Step <= cstypes.RoundStepPropose && cs.isProposalComplete() { |
|
|
|
// Move onto the next step
|
|
|
|
cs.enterPrevote(ctx, height, cs.Round) |
|
|
|
if hasTwoThirds { // this is optimisation as this will be triggered when prevote is added
|
|
|
|
cs.enterPrecommit(ctx, height, cs.Round) |
|
|
|
} |
|
|
|
|
|
|
|
return added, nil |
|
|
|
} else if cs.Step == cstypes.RoundStepCommit { |
|
|
|
// If we're waiting on the proposal block...
|
|
|
|
cs.tryFinalizeCommit(ctx, height) |
|
|
|
} |
|
|
|
|
|
|
|
return added, nil |
|
|
|
} |
|
|
|
|
|
|
|
// Attempt to add the vote. if its a duplicate signature, dupeout the validator
|
|
|
|