TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1707 from nspcc-dev/lastproposal-fixes

Browse source 
Fix previous proposal handling in consensus
This commit is contained in:
Roman Khimov 2021-02-05 12:06:52 +03:00 committed by GitHub
commit 1ee21666b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/consensus/consensus.go
View file

@ -320,9 +320,7 @@ func (s *service) handleChainBlock(b *coreb.Block) {
s.log.Debug("new block in the chain", s.log.Debug("new block in the chain",
zap.Uint32("dbft index", s.dbft.BlockIndex), zap.Uint32("dbft index", s.dbft.BlockIndex),
zap.Uint32("chain index", s.Chain.BlockHeight())) zap.Uint32("chain index", s.Chain.BlockHeight()))
if s.lastTimestamp < b.Timestamp { s.postBlock(b)
s.lastTimestamp = b.Timestamp
}
s.dbft.InitializeConsensus(0) s.dbft.InitializeConsensus(0)
} }
} }
@ -527,9 +525,14 @@ func (s *service) processBlock(b block.Block) {
s.log.Warn("error on add block", zap.Error(err)) s.log.Warn("error on add block", zap.Error(err))
} }
} }
if s.lastTimestamp < bb.Timestamp { s.postBlock(bb)
s.lastTimestamp = bb.Timestamp }
func (s *service) postBlock(b *coreb.Block) {
if s.lastTimestamp < b.Timestamp {
s.lastTimestamp = b.Timestamp
} }
s.lastProposal = nil
} }
func (s *service) getBlockWitness(b *coreb.Block) *transaction.Witness { func (s *service) getBlockWitness(b *coreb.Block) *transaction.Witness {
@ -580,7 +583,7 @@ func (s *service) getVerifiedTx() []block.Transaction {
var txx []*transaction.Transaction var txx []*transaction.Transaction
if s.dbft.ViewNumber > 0 { if s.dbft.ViewNumber > 0 && len(s.lastProposal) > 0 {
txx = make([]*transaction.Transaction, 0, len(s.lastProposal)) txx = make([]*transaction.Transaction, 0, len(s.lastProposal))
for i := range s.lastProposal { for i := range s.lastProposal {
if tx, ok := pool.TryGetValue(s.lastProposal[i]); ok { if tx, ok := pool.TryGetValue(s.lastProposal[i]); ok {