feat: add an option for selecting priv key type to unsafe_reset_all…

…, `unsafe_reset_priv_validator`, and `gen_validator`

cmd/tendermint/commands/gen_validator.go

@@ -1,10 +1,8 @@
 package commands
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
-
+	tmos "github.com/tendermint/tendermint/libs/os"
 	"github.com/tendermint/tendermint/privval"
 )
 
@@ -13,15 +11,37 @@ import (
 var GenValidatorCmd = &cobra.Command{
 	Use:   "gen_validator",
 	Short: "Generate new validator keypair",
-	Run:   genValidator,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return genValidator(cmd, args)
+	},
+}
+
+func init() {
+	GenValidatorCmd.Flags().String("priv_key_type", config.PrivKeyType,
+		"Specify validator's private key type (ed25519 | composite)")
 }
 
-func genValidator(cmd *cobra.Command, args []string) {
-	pv, _ := privval.GenFilePV("", "", privval.PrivKeyTypeEd25519)
-	jsbz, err := cdc.MarshalJSON(pv)
-	if err != nil {
-		panic(err)
+func genValidator(cmd *cobra.Command, args []string) error {
+	// private validator
+	privValKeyFile := config.PrivValidatorKeyFile()
+	privValStateFile := config.PrivValidatorStateFile()
+	privKeyType := config.PrivValidatorKeyType()
+	var pv *privval.FilePV
+	if tmos.FileExists(privValKeyFile) {
+		pv = privval.LoadFilePV(privValKeyFile, privValStateFile)
+		logger.Info("Found private validator", "keyFile", privValKeyFile,
+			"stateFile", privValStateFile)
+	} else {
+		var err error
+		pv, err = privval.GenFilePV(privValKeyFile, privValStateFile, privKeyType)
+		if err != nil {
+			return err
+		}
+		if pv != nil {
+			pv.Save()
+		}
+		logger.Info("Generated private validator", "keyFile", privValKeyFile,
+			"stateFile", privValStateFile)
 	}
-	fmt.Printf(`%v
-`, string(jsbz))
+	return nil
 }

cmd/tendermint/commands/reset_priv_validator.go

@@ -33,6 +33,10 @@ var keepAddrBook bool
 
 func init() {
 	ResetAllCmd.Flags().BoolVar(&keepAddrBook, "keep-addr-book", false, "Keep the address book intact")
+	ResetAllCmd.Flags().String("priv_key_type", config.PrivKeyType,
+		"Specify validator's private key type (ed25519 | composite)")
+	ResetPrivValidatorCmd.Flags().String("priv_key_type", config.PrivKeyType,
+		"Specify validator's private key type (ed25519 | composite)")
 }
 
 // XXX: this is totally unsafe.