Add ValidatorPubkeyTypes as a consensus param

CHANGELOG_PENDING.md

@@ -52,6 +52,8 @@ BREAKING CHANGES:
     `PrecommitType`.
 
 * Blockchain Protocol
+  * [abci] [\#2636](https://github.com/tendermint/tendermint/issues/2636) Add ValidatorParams field to ConsensusParams.
+  (Used to control which pubkey types validators can use, by amino route)
   * [types] Update SignBytes for `Vote`/`Proposal`/`Heartbeat`:
     * [\#2459](https://github.com/tendermint/tendermint/issues/2459) Use amino encoding instead of JSON in `SignBytes`.
     * [\#2598](https://github.com/tendermint/tendermint/issues/2598) Reorder fields and use fixed sized encoding.

abci/types/types.proto

@@ -210,6 +210,7 @@ message ResponseCommit {
 message ConsensusParams {
   BlockSize block_size = 1;
   EvidenceParams evidence_params = 2;
+  ValidatorParams validator_params = 3;
 }
 
 // BlockSize contains limits on the block size.
@@ -226,6 +227,11 @@ message EvidenceParams {
   int64 max_age = 1;
 }
 
+// ValidatorParams contains limits on validators.
+message ValidatorParams {
+  repeated string validator_pubkey_types = 3;
+}
+
 message LastCommitInfo {
   int32 round = 1;
   repeated VoteInfo votes = 2 [(gogoproto.nullable)=false];

docs/spec/abci/abci.md

@@ -444,6 +444,8 @@ Commit are included in the header of the next block.
   - `BlockSize (BlockSize)`: Parameters limiting the size of a block.
   - `EvidenceParams (EvidenceParams)`: Parameters limiting the validity of
     evidence of byzantine behaviour.
+  - `ValidatorPubkeyTypes ([]string)`: List of amino routes for the pubkeys
+    which validators may use.
 
 ### BlockSize
 

state/store.go

@@ -251,7 +251,7 @@ func LoadConsensusParams(db dbm.DB, height int64) (types.ConsensusParams, error)
 		return empty, ErrNoConsensusParamsForHeight{height}
 	}
 
-	if paramsInfo.ConsensusParams == empty {
+	if paramsInfo.ConsensusParams.Equals(&empty) {
 		paramsInfo2 := loadConsensusParamsInfo(db, paramsInfo.LastHeightChanged)
 		if paramsInfo2 == nil {
 			panic(

types/params.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/crypto/ed25519"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 	cmn "github.com/tendermint/tendermint/libs/common"
 )
@@ -19,6 +20,7 @@ const (
 type ConsensusParams struct {
 	BlockSize      `json:"block_size_params"`
 	EvidenceParams `json:"evidence_params"`
+	Validator      ValidatorParams `json:"validator_params"`
 }
 
 // BlockSize contain limits on the block size.
@@ -32,11 +34,16 @@ type EvidenceParams struct {
 	MaxAge int64 `json:"max_age"` // only accept new evidence more recent than this
 }
 
+type ValidatorParams struct {
+	ValidatorPubkeyTypes []string `json:"validator_pubkey_types"` // amino routes accepted for validator pubkeys
+}
+
 // DefaultConsensusParams returns a default ConsensusParams.
 func DefaultConsensusParams() *ConsensusParams {
 	return &ConsensusParams{
 		DefaultBlockSize(),
 		DefaultEvidenceParams(),
+		DefaultValidatorParams(),
 	}
 }
 
@@ -55,6 +62,12 @@ func DefaultEvidenceParams() EvidenceParams {
 	}
 }
 
+// DefaultValidatorParams returns a default ValidatorParams, which allows
+// only ed25519 pubkeys.
+func DefaultValidatorParams() ValidatorParams {
+	return ValidatorParams{[]string{ed25519.PubKeyAminoRoute}}
+}
+
 // Validate validates the ConsensusParams to ensure all values are within their
 // allowed limits, and returns an error if they are not.
 func (params *ConsensusParams) Validate() error {
@@ -77,6 +90,10 @@ func (params *ConsensusParams) Validate() error {
 			params.EvidenceParams.MaxAge)
 	}
 
+	if len(params.Validator.ValidatorPubkeyTypes) == 0 {
+		return cmn.NewError("len(ValidatorParams.ValidatorPubkeyTypes) must be greater than 0")
+	}
+
 	return nil
 }
 
@@ -94,6 +111,27 @@ func (params *ConsensusParams) Hash() []byte {
 	return hasher.Sum(nil)
 }
 
+func (params *ConsensusParams) Equals(params2 *ConsensusParams) bool {
+	if params.BlockSize == params2.BlockSize &&
+		params.EvidenceParams == params2.EvidenceParams &&
+		stringSliceEqual(params.Validator.ValidatorPubkeyTypes, params2.Validator.ValidatorPubkeyTypes) {
+		return true
+	}
+	return false
+}
+
+func stringSliceEqual(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i := 0; i < len(a); i++ {
+		if a[i] != b[i] {
+			return false
+		}
+	}
+	return true
+}
+
 // Update returns a copy of the params with updates from the non-zero fields of p2.
 // NOTE: note: must not modify the original
 func (params ConsensusParams) Update(params2 *abci.ConsensusParams) ConsensusParams {
@@ -111,5 +149,8 @@ func (params ConsensusParams) Update(params2 *abci.ConsensusParams) ConsensusPar
 	if params2.EvidenceParams != nil {
 		res.EvidenceParams.MaxAge = params2.EvidenceParams.MaxAge
 	}
+	if params2.ValidatorParams != nil {
+		res.Validator.ValidatorPubkeyTypes = params2.ValidatorParams.ValidatorPubkeyTypes
+	}
 	return res
 }