aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-05-30 19:24:01 +0800
committerPéter Szilágyi <peterke@gmail.com>2017-05-30 19:24:01 +0800
commitec1700600a96e493dd0fac2a182dc191eaf227a0 (patch)
treef4a0b0eb9a555940c79fbf727436390ad9a04f34
parentb0f30b0b37f2afcf9bf9fb8519abc7ffe595e615 (diff)
downloaddexon-ec1700600a96e493dd0fac2a182dc191eaf227a0.tar
dexon-ec1700600a96e493dd0fac2a182dc191eaf227a0.tar.gz
dexon-ec1700600a96e493dd0fac2a182dc191eaf227a0.tar.bz2
dexon-ec1700600a96e493dd0fac2a182dc191eaf227a0.tar.lz
dexon-ec1700600a96e493dd0fac2a182dc191eaf227a0.tar.xz
dexon-ec1700600a96e493dd0fac2a182dc191eaf227a0.tar.zst
dexon-ec1700600a96e493dd0fac2a182dc191eaf227a0.zip
cmd/puppeth: fix improper key validation for remotes
-rw-r--r--cmd/puppeth/module_node.go2
-rw-r--r--cmd/puppeth/wizard_node.go3
2 files changed, 2 insertions, 3 deletions
diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go
index 6372f60d2..ce1d34135 100644
--- a/cmd/puppeth/module_node.go
+++ b/cmd/puppeth/module_node.go
@@ -135,7 +135,7 @@ func deployNode(client *sshClient, network string, bootv4, bootv5 []string, conf
}
defer client.Run("rm -rf " + workdir)
- // Build and deploy the bootnode service
+ // Build and deploy the boot or seal node service
return nil, client.Stream(fmt.Sprintf("cd %s && docker-compose -p %s up -d --build", workdir, network))
}
diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go
index 483d9fe05..05232486b 100644
--- a/cmd/puppeth/wizard_node.go
+++ b/cmd/puppeth/wizard_node.go
@@ -109,8 +109,7 @@ func (w *wizard) deployNode(boot bool) {
} else if w.conf.genesis.Config.Clique != nil {
// If a previous signer was already set, offer to reuse it
if infos.keyJSON != "" {
- var key keystore.Key
- if err := json.Unmarshal([]byte(infos.keyJSON), &key); err != nil {
+ if key, err := keystore.DecryptKey([]byte(infos.keyJSON), infos.keyPass); err != nil {
infos.keyJSON, infos.keyPass = "", ""
} else {
fmt.Println()