Merge branch 'main' into main

pull/3405/head
Rongjian Lan 4 years ago committed by GitHub
commit 258c162415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      consensus/validator.go

@ -291,10 +291,9 @@ func (consensus *Consensus) onCommitted(msg *msg_pb.Message) {
mask.SetMask(commitSigBitmap[bls.BLSSignatureSizeInBytes:]) mask.SetMask(commitSigBitmap[bls.BLSSignatureSizeInBytes:])
cur := mask.CountEnabled() cur := mask.CountEnabled()
if new > cur { if new > cur {
consensus.getLogger().Info().Hex("old", commitSigBitmap).Hex("new", recvMsg.Payload).Msg("[OnCommitted] Overriding commit signatures!!")
consensus.Blockchain.WriteCommitSig(blockObj.NumberU64(), recvMsg.Payload) consensus.Blockchain.WriteCommitSig(blockObj.NumberU64(), recvMsg.Payload)
} }
} else {
consensus.Blockchain.WriteCommitSig(blockObj.NumberU64(), recvMsg.Payload)
} }
consensus.tryCatchup() consensus.tryCatchup()

Loading…
Cancel
Save