1 files changed, 8 insertions, 7 deletions
diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go
index b122a4ddf..cb467719d 100644
--- a/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go
+++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/agreement.go
@@ -361,9 +361,6 @@ func (a *agreement) sanityCheck(vote *types.Vote) error {
 	if vote.Type >= types.MaxVoteType {
 		return ErrInvalidVote
 	}
-	if _, exist := a.notarySet[vote.ProposerID]; !exist {
-		return ErrNotInNotarySet
-	}
 	ok, err := utils.VerifyVoteSignature(vote)
 	if err != nil {
 		return err
@@ -371,6 +368,10 @@ func (a *agreement) sanityCheck(vote *types.Vote) error {
 	if !ok {
 		return ErrIncorrectVoteSignature
 	}
+	if vote.Position.Round != a.agreementID().Round {
+		// TODO(jimmy): maybe we can verify partial signature at agreement-mgr.
+		return nil
+	}
 	if !a.data.recv.VerifyPartialSignature(vote) {
 		return ErrIncorrectVotePartialSignature
 	}
@@ -412,7 +413,7 @@ func (a *agreement) updateFilter(filter *utils.VoteFilter) {
 	filter.Confirm = a.hasOutput
 	filter.LockIter = a.data.lockIter
 	filter.Period = a.data.period
-	filter.Height = a.agreementID().Height
+	filter.Position.Height = a.agreementID().Height
 }
 
 // processVote is the entry point for processing Vote.
@@ -426,8 +427,8 @@ func (a *agreement) processVote(vote *types.Vote) error {
 
 	// Agreement module has stopped.
 	if isStop(aID) {
-		// Hacky way to not drop first votes for genesis height.
-		if vote.Position.Height == types.GenesisHeight {
+		// Hacky way to not drop first votes when round just begins.
+		if vote.Position.Round == aID.Round {
 			a.pendingVote = append(a.pendingVote, pendingVote{
 				vote:         vote,
 				receivedTime: time.Now().UTC(),
@@ -690,7 +691,7 @@ func (a *agreement) processBlock(block *types.Block) error {
 				if !exist {
 					return true
 				}
-				ok, err := a.data.leader.validLeader(block)
+				ok, err := a.data.leader.validLeader(block, a.data.leader.hashCRS)
 				if err != nil {
 					fmt.Println("Error checking validLeader for Fast BA",
 						"error", err, "block", block)