Added readSignatureBitmapPayload locks.

consensus/consensus_service.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/harmony-one/harmony/core/types"
 	"github.com/harmony-one/harmony/crypto/bls"
+	"github.com/harmony-one/harmony/multibls"
 
 	"github.com/ethereum/go-ethereum/common"
 	protobuf "github.com/golang/protobuf/proto"
@@ -229,16 +230,20 @@ func (consensus *Consensus) SetBlockNum(blockNum uint64) {
 }
 
 // ReadSignatureBitmapPayload read the payload for signature and bitmap; offset is the beginning position of reading
-func (consensus *Consensus) ReadSignatureBitmapPayload(
-	recvPayload []byte, offset int,
-) (*bls_core.Sign, *bls_cosi.Mask, error) {
+func (consensus *Consensus) ReadSignatureBitmapPayload(recvPayload []byte, offset int) (*bls_core.Sign, *bls_cosi.Mask, error) {
+	consensus.mutex.RLock()
+	members := consensus.Decider.Participants()
+	consensus.mutex.RUnlock()
+	return consensus.readSignatureBitmapPayload(recvPayload, offset, members)
+}
+
+func (consensus *Consensus) readSignatureBitmapPayload(recvPayload []byte, offset int, members multibls.PublicKeys) (*bls_core.Sign, *bls_cosi.Mask, error) {
 	if offset+bls.BLSSignatureSizeInBytes > len(recvPayload) {
 		return nil, nil, errors.New("payload not have enough length")
 	}
 	sigAndBitmapPayload := recvPayload[offset:]
 
 	// TODO(audit): keep a Mask in the Decider so it won't be reconstructed on the fly.
-	members := consensus.Decider.Participants()
 	return chain.ReadSignatureBitmapByPublicKeys(
 		sigAndBitmapPayload, members,
 	)
@@ -524,7 +529,7 @@ func (consensus *Consensus) selfCommit(payload []byte) error {
 		return errGetPreparedBlock
 	}
 
-	aggSig, mask, err := consensus.ReadSignatureBitmapPayload(payload, 32)
+	aggSig, mask, err := consensus.readSignatureBitmapPayload(payload, 32, consensus.Decider.Participants())
 	if err != nil {
 		return errReadBitmapPayload
 	}

consensus/validator.go

@@ -62,7 +62,7 @@ func (consensus *Consensus) onAnnounce(msg *msg_pb.Message) {
 	if len(recvMsg.Block) > 0 {
 		go func() {
 			// Best effort check, no need to error out.
-			_, err := consensus.validateNewBlock(recvMsg)
+			_, err := consensus.ValidateNewBlock(recvMsg)
 
 			if err == nil {
 				consensus.getLogger().Info().
@@ -205,7 +205,7 @@ func (consensus *Consensus) onPrepared(recvMsg *FBFTMessage) {
 
 	// check validity of prepared signature
 	blockHash := recvMsg.BlockHash
-	aggSig, mask, err := consensus.ReadSignatureBitmapPayload(recvMsg.Payload, 0)
+	aggSig, mask, err := consensus.readSignatureBitmapPayload(recvMsg.Payload, 0, consensus.Decider.Participants())
 	if err != nil {
 		consensus.getLogger().Error().Err(err).Msg("ReadSignatureBitmapPayload failed!")
 		return

consensus/view_change.go

@@ -501,7 +501,7 @@ func (consensus *Consensus) onNewView(recvMsg *FBFTMessage) {
 			utils.CountOneBits(m3Mask.Bitmap) > utils.CountOneBits(m2Mask.Bitmap)) {
 		// m1 is not empty, check it's valid
 		blockHash := recvMsg.Payload[:32]
-		aggSig, mask, err := consensus.ReadSignatureBitmapPayload(recvMsg.Payload, 32)
+		aggSig, mask, err := consensus.readSignatureBitmapPayload(recvMsg.Payload, 32, consensus.Decider.Participants())
 		if err != nil {
 			consensus.getLogger().Error().Err(err).
 				Msg("[onNewView] ReadSignatureBitmapPayload Failed")