Handle coordinator key with keystore

.gitignore

@@ -4,4 +4,5 @@ build
 config.toml
 batches.json
 users.json
-genesis.json
+genesis.json
+.keystore

cmd/import.go

@@ -0,0 +1,71 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+
+	"github.com/BOPR/config"
+	"github.com/ethereum/go-ethereum/accounts/keystore"
+	"github.com/ethereum/go-ethereum/console/prompt"
+	"github.com/spf13/cobra"
+)
+
+const (
+	defaultKeystorePath = ".keystore/"
+)
+
+func importCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "import",
+		Short: "Import keystore for operator",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			keyfile := args[0]
+			passphrase, err := getPassPhrase("Unlock the keystore with the password", false)
+			if err != nil {
+				return err
+			}
+
+			keystoreBytes, err := ioutil.ReadFile(keyfile)
+			if err != nil {
+				return err
+			}
+
+			ks := keystore.NewKeyStore(defaultKeystorePath, keystore.StandardScryptN, keystore.StandardScryptP)
+
+			newPassphrase, err := getPassPhrase("Please give a new password", true)
+			if err != nil {
+				return err
+			}
+			acct, err := ks.Import(keystoreBytes, passphrase, newPassphrase)
+			if err != nil {
+				return err
+			}
+			fmt.Printf("Operator Address: {%x}\n", acct.Address)
+			cfg, err := config.ParseConfig()
+			cfg.KeystorePassphrase = newPassphrase
+			config.WriteConfigFile("./config.toml", &cfg)
+
+			return nil
+		},
+	}
+}
+
+func getPassPhrase(text string, confirmation bool) (string, error) {
+	if text != "" {
+		fmt.Println(text)
+	}
+	password, err := prompt.Stdin.PromptPassword("Password: ")
+	if err != nil {
+		return "", fmt.Errorf("Failed to read password: %v", err)
+	}
+	if confirmation {
+		confirm, err := prompt.Stdin.PromptPassword("Repeat password: ")
+		if err != nil {
+			return "", fmt.Errorf("Failed to read password confirmation: %v", err)
+		}
+		if password != confirm {
+			return "", fmt.Errorf("Passwords do not match")
+		}
+	}
+	return password, nil
+}

cmd/main.go

@@ -49,6 +49,7 @@ func main() {
 	}
 
 	rootCmd.AddCommand(initCmd())
+	rootCmd.AddCommand(importCmd())
 	rootCmd.AddCommand(configureGenesisCmd())
 	rootCmd.AddCommand(startCmd())
 	rootCmd.AddCommand(startRestServerCmd())

config/config.go

@@ -59,8 +59,9 @@ type Configuration struct {
 	MassMigration   string `mapstructure:"mass_migration_address"`
 	Create2Transfer string `mapstructure:"create2transfer_address"`
 
-	OperatorKey     string `mapstructure:"operator_key"`
-	OperatorAddress string `mapstructure:"operator_address"`
+	OperatorKey        string `mapstructure:"operator_key"`
+	OperatorAddress    string `mapstructure:"operator_address"`
+	KeystorePassphrase string `mapstructure:"keystore_passphrase"`
 
 	MaxTreeDepth      uint64 `mapstructure:"max_tree_depth"`
 	MaxDepositSubtree uint64 `mapstructure:"max_deposit_subtree"`
@@ -94,8 +95,9 @@ func GetDefaultConfig() Configuration {
 		Create2Transfer:        ethCmn.Address{}.String(),
 
 		// Default Account #0 from hardhat. DO NOT USE IN PRODUCTION
-		OperatorKey:     "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
-		OperatorAddress: "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+		OperatorKey:        "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
+		OperatorAddress:    "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+		KeystorePassphrase: "",
 
 		MaxTreeDepth:      32,
 		MaxDepositSubtree: 1,

config/toml.go

@@ -27,6 +27,7 @@ max_commitments_per_batch = "{{ .MaxCommitmentsPerBatch }}"
 #### Keystore #####
 operator_key = "{{ .OperatorKey }}"
 operator_address = "{{ .OperatorAddress }}"
+keystore_passphrase = "{{ .KeystorePassphrase }}"
 
 #### Syncer settings #####
 confirmation_blocks = "{{ .ConfirmationBlocks }}"