added more panics if keys aren't BLS12-381

berachain · Jan 9, 2025 · 1fd3cd1 · 1fd3cd1
1 parent 2b2d2d5
commit 1fd3cd1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/internal/consensus/state.go b/internal/consensus/state.go
@@ -1311,7 +1311,7 @@ func (cs *State) createProposalBlock(ctx context.Context) (*types.Block, error)
 
 	case cs.LastCommit.HasTwoThirdsMajority():
 		// Make the commit from LastCommit.
-		_, blsKey := cs.privValidatorPubKey.(*bls12381.PubKey)
+		key, blsKey := cs.privValidatorPubKey.(*bls12381.PubKey)
 		canBeAggregated := blsKey &&
 			cs.state.Validators.AllKeysHaveSameType()
 		if canBeAggregated {
@@ -1320,7 +1320,7 @@ func (cs *State) createProposalBlock(ctx context.Context) (*types.Block, error)
 			}
 			lastExtCommit = cs.LastCommit.MakeBLSCommit()
 		} else {
-			lastExtCommit = cs.LastCommit.MakeExtendedCommit(cs.state.ConsensusParams.Feature)
+			panic("last commit's validators keys are not BLS12-381. Found: " + key.Type())
 		}
 
 	default: // This shouldn't happen.

diff --git a/types/validation.go b/types/validation.go
@@ -374,7 +374,10 @@ func verifyAggregatedCommit(
 			}
 			pk, ok := val.PubKey.(*bls12381.PubKey)
 			if !ok {
-				pk2 := val.PubKey.(bls12381.PubKey)
+				pk2, ok2 := val.PubKey.(bls12381.PubKey)
+				if !ok2 {
+					panic("Validator key is " + val.PubKey.Type() + ". Must be BLS12_381")
+				}
 				pk = &pk2
 			}
 			pubkeys1 = append(pubkeys1, pk)
@@ -385,7 +388,10 @@ func verifyAggregatedCommit(
 			}
 			pk, ok := val.PubKey.(*bls12381.PubKey)
 			if !ok {
-				pk2 := val.PubKey.(bls12381.PubKey)
+				pk2, ok2 := val.PubKey.(bls12381.PubKey)
+				if !ok2 {
+					panic("Validator key is " + val.PubKey.Type() + ". Must be BLS12_381")
+				}
 				pk = &pk2
 			}
 			pubkeys2 = append(pubkeys2, pk)