roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #2309 from bas-vk/passwd

Browse Source 
console: allow optional password on the command line
This commit is contained in:
Péter Szilágyi 2016-03-08 17:07:12 +02:00
commit 05c86c2c9f
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/utils/jeth.go
View File

@ -58,7 +58,7 @@ func (self *Jeth) err(call otto.FunctionCall, code int, msg string, id *int64) (
// UnlockAccount asks the user for the password and than executes the jeth.UnlockAccount callback in the jsre // UnlockAccount asks the user for the password and than executes the jeth.UnlockAccount callback in the jsre
func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) { func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) {
var cmd, account, passwd string var account, passwd string
timeout := int64(300) timeout := int64(300)
var ok bool var ok bool
@ -92,8 +92,7 @@ func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) {
} }
} }
cmd = fmt.Sprintf("jeth.unlockAccount('%s', '%s', %d)", account, passwd, timeout) if val, err := call.Otto.Call("jeth.unlockAccount", nil, account, passwd, timeout); err == nil {
if val, err := call.Otto.Run(cmd); err == nil {
return val return val
} }
@ -102,8 +101,10 @@ func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) {
// NewAccount asks the user for the password and than executes the jeth.newAccount callback in the jsre // NewAccount asks the user for the password and than executes the jeth.newAccount callback in the jsre
func (self *Jeth) NewAccount(call otto.FunctionCall) (response otto.Value) { func (self *Jeth) NewAccount(call otto.FunctionCall) (response otto.Value) {
var passwd string
if len(call.ArgumentList) == 0 { if len(call.ArgumentList) == 0 {
passwd, err := PromptPassword("Passphrase: ", true) var err error
passwd, err = PromptPassword("Passphrase: ", true)
if err != nil { if err != nil {
return otto.FalseValue() return otto.FalseValue()
} }
@ -116,13 +117,18 @@ func (self *Jeth) NewAccount(call otto.FunctionCall) (response otto.Value) {
fmt.Println("Passphrases don't match") fmt.Println("Passphrases don't match")
return otto.FalseValue() return otto.FalseValue()
} }
} else if len(call.ArgumentList) == 1 && call.Argument(0).IsString() {
cmd := fmt.Sprintf("jeth.newAccount('%s')", passwd) passwd, _ = call.Argument(0).ToString()
if val, err := call.Otto.Run(cmd); err == nil {
return val
}
} else { } else {
fmt.Println("New account doesn't expect argument(s), you will be prompted for a password") fmt.Println("expected 0 or 1 string argument")
return otto.FalseValue()
}
if ret, err := call.Otto.Call("jeth.newAccount", nil, passwd); err == nil {
return ret
} else {
fmt.Printf("%v\n", err)
return otto.FalseValue()
} }
return otto.FalseValue() return otto.FalseValue()