chore(types): detect quorum hash mismatch when verifying commit (#791)

* chore(types): detect quorum hash mismatch when verifying commit * test(types): wrong quorum hash when verifying commits
dashpay · May 20, 2024 · 991f9bc · 991f9bc
1 parent e1239db
commit 991f9bc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/types/validation_test.go b/types/validation_test.go
@@ -1,6 +1,7 @@
 package types
 
 import (
+	"bytes"
 	"context"
 	"testing"
 
@@ -101,6 +102,15 @@ func TestValidatorSet_VerifyCommit_All(t *testing.T) {
 					QuorumSigns: QuorumSigns{BlockSign: vote2.BlockSignature, VoteExtensionSignatures: vote2.VoteExtensions.GetSignatures()},
 				},
 			), true},
+		// quorum hash mismatch
+		{"wrong quorum hash", chainID, vote.BlockID, vote.Height,
+			NewCommit(vote.Height, vote.Round, vote.BlockID,
+				vote.VoteExtensions,
+				&CommitSigns{
+					QuorumHash:  bytes.Repeat([]byte{0xaa}, crypto.QuorumHashSize),
+					QuorumSigns: QuorumSigns{BlockSign: vote2.BlockSignature, VoteExtensionSignatures: vote2.VoteExtensions.GetSignatures()},
+				},
+			), true},
 	}
 
 	for _, tc := range testCases {

diff --git a/types/validator_set.go b/types/validator_set.go
@@ -914,6 +914,11 @@ func (vals *ValidatorSet) VerifyCommit(chainID string, blockID BlockID,
 	if err != nil {
 		return err
 	}
+	if !vals.QuorumHash.Equal(commit.QuorumHash) {
+		return fmt.Errorf("invalid commit -- wrong quorum hash: validator set uses %X, commit has %X",
+			vals.QuorumHash, commit.QuorumHash)
+
+	}
 	err = quorumSigns.Verify(vals.ThresholdPublicKey, NewQuorumSignsFromCommit(commit))
 	if err != nil {
 		return fmt.Errorf("invalid commit signatures for quorum(type=%v, hash=%X), thresholdPubKey=%X: %w",
@@ -991,7 +996,7 @@ func (vals *ValidatorSet) StringIndented(indent string) string {
 		return "nil-ValidatorSet"
 	}
 	var valStrings []string
-	vals.Iterate(func(index int, val *Validator) bool {
+	vals.Iterate(func(_index int, val *Validator) bool {
 		valStrings = append(valStrings, val.String())
 		return false
 	})
@@ -1021,7 +1026,7 @@ func (vals *ValidatorSet) StringIndentedBasic(indent string) string {
 		return "nil-ValidatorSet"
 	}
 	var valStrings []string
-	vals.Iterate(func(index int, val *Validator) bool {
+	vals.Iterate(func(_index int, val *Validator) bool {
 		valStrings = append(valStrings, val.ShortStringBasic())
 		return false
 	})