Skip to content

G
Geth-Modification
Commit f460b021 authored by Felix Lange's avatar Felix Lange
Browse files
Options

Merge pull request #2446 from karalabe/console-unlock-fix 

cmd/utils: fix accounts merge error on console unlock
parents 1e9b504e a1f1c404
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
cmd/utils/jeth.go
View file @ f460b021
...@@ -76,10 +76,9 @@ func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) { ...@@ -76,10 +76,9 @@ func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) {
if call.Argument(1).IsUndefined() || call.Argument(1).IsNull() { if call.Argument(1).IsUndefined() || call.Argument(1).IsNull() {
fmt.Printf("Unlock account %s\n", account) fmt.Printf("Unlock account %s\n", account)
if input, err := Stdin.PasswordPrompt("Passphrase: "); err != nil { if input, err := Stdin.PasswordPrompt("Passphrase: "); err != nil {
return otto.FalseValue()
passwd, _ = otto.ToValue(input)
} else {
throwJSExeception(err.Error()) throwJSExeception(err.Error())
} else {
passwd, _ = otto.ToValue(input)
} }
} else { } else {
if !call.Argument(1).IsString() { if !call.Argument(1).IsString() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment