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

consortium/v2: Change rules to choose best parent #422

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

consortium/v2: Change rules to choose best parent #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion consensus/consortium/v2/consortium.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,9 +1171,14 @@ func (c *Consortium) GetBestParentBlock(chain *core.BlockChain) (*types.Block, b
// Miner can create an inturn block which helps the chain to have
// greater diffculty
if snap.supposeValidator() == signer {
if !snap.IsRecentlySigned(signer) {
oldJustifiedBlockNumber, _ := c.GetJustifiedBlock(chain, currentBlock.NumberU64(), currentBlock.Hash())
newJustifiedBlockNumber, _ := c.GetJustifiedBlock(chain, prevBlock.NumberU64(), prevBlock.Hash())
// TODO: the case in which oldJustifiedBlockNumber - 1 == newJustifiedBlockNumber and the upcoming
// block is justified is not considered here
if !snap.IsRecentlySigned(signer) && oldJustifiedBlockNumber <= newJustifiedBlockNumber {
return prevBlock, true
}
return currentBlock, false
}

block = prevBlock
Expand Down
Loading