Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
ec170060
Unverified
Commit
ec170060
authored
May 30, 2017
by
Péter Szilágyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmd/puppeth: fix improper key validation for remotes
parent
b0f30b0b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
module_node.go
cmd/puppeth/module_node.go
+1
-1
wizard_node.go
cmd/puppeth/wizard_node.go
+1
-2
No files found.
cmd/puppeth/module_node.go
View file @
ec170060
...
@@ -135,7 +135,7 @@ func deployNode(client *sshClient, network string, bootv4, bootv5 []string, conf
...
@@ -135,7 +135,7 @@ func deployNode(client *sshClient, network string, bootv4, bootv5 []string, conf
}
}
defer
client
.
Run
(
"rm -rf "
+
workdir
)
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
))
return
nil
,
client
.
Stream
(
fmt
.
Sprintf
(
"cd %s && docker-compose -p %s up -d --build"
,
workdir
,
network
))
}
}
...
...
cmd/puppeth/wizard_node.go
View file @
ec170060
...
@@ -109,8 +109,7 @@ func (w *wizard) deployNode(boot bool) {
...
@@ -109,8 +109,7 @@ func (w *wizard) deployNode(boot bool) {
}
else
if
w
.
conf
.
genesis
.
Config
.
Clique
!=
nil
{
}
else
if
w
.
conf
.
genesis
.
Config
.
Clique
!=
nil
{
// If a previous signer was already set, offer to reuse it
// If a previous signer was already set, offer to reuse it
if
infos
.
keyJSON
!=
""
{
if
infos
.
keyJSON
!=
""
{
var
key
keystore
.
Key
if
key
,
err
:=
keystore
.
DecryptKey
([]
byte
(
infos
.
keyJSON
),
infos
.
keyPass
);
err
!=
nil
{
if
err
:=
json
.
Unmarshal
([]
byte
(
infos
.
keyJSON
),
&
key
);
err
!=
nil
{
infos
.
keyJSON
,
infos
.
keyPass
=
""
,
""
infos
.
keyJSON
,
infos
.
keyPass
=
""
,
""
}
else
{
}
else
{
fmt
.
Println
()
fmt
.
Println
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment