aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/api/personal.go
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-09-22 16:34:58 +0800
committerzelig <viktor.tron@gmail.com>2015-10-22 06:22:39 +0800
commit8b81ad1fc40080af441c0c6df94f0b2ea46e320b (patch)
tree7d8817ec84be38b911f967f1ecd5618d02e4caa9 /rpc/api/personal.go
parent58d0752fdd1c7363fb1a127cd7e0a86d7602be02 (diff)
downloaddexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.gz
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.bz2
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.lz
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.xz
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.zst
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.zip
console:
* lines with leading space are ommitted from history * exit processed even with whitespace around * all whitespace lines (not only empty ones) are ignored add 7 missing commands to admin api autocomplete registrar: methods now return proper error if reg addresses are not set. fixes #1457 rpc/console: fix personal.newAccount() regression. Now all comms accept interactive password registrar: add registrar tests for errors crypto: catch AES decryption error on presale wallet import + fix error msg format. fixes #1580 CLI: improve error message when starting a second instance of geth. fixes #1564 cli/accounts: unlock multiple accounts. fixes #1785 * make unlocking multiple accounts work with inline <() fd * passwdfile now correctly read only once * improve logs * fix CLI help text for unlocking fix regression with docRoot / admin API * docRoot/jspath passed to rpc/api ParseApis, which passes onto adminApi * docRoot field for JS console in order to pass when RPC is (re)started * improve flag desc for jspath common/docserver: catch http errors from response fix rpc/api tests common/natspec: fix end to end test (skipped because takes 8s) registrar: fix major regression: * deploy registrars on frontier * register HashsReg and UrlHint in GlobalRegistrar. * set all 3 contract addresses in code * zero out addresses first in tests
Diffstat (limited to 'rpc/api/personal.go')
-rw-r--r--rpc/api/personal.go17
1 files changed, 15 insertions, 2 deletions
diff --git a/rpc/api/personal.go b/rpc/api/personal.go
index 1fb412612..4f347c610 100644
--- a/rpc/api/personal.go
+++ b/rpc/api/personal.go
@@ -98,9 +98,22 @@ func (self *personalApi) NewAccount(req *shared.Request) (interface{}, error) {
if err := self.codec.Decode(req.Params, &args); err != nil {
return nil, shared.NewDecodeParamError(err.Error())
}
-
+ var passwd string
+ if args.Passphrase == nil {
+ fe := self.xeth.Frontend()
+ if fe == nil {
+ return false, fmt.Errorf("unable to create account: unable to interact with user")
+ }
+ var ok bool
+ passwd, ok = fe.AskPassword()
+ if !ok {
+ return false, fmt.Errorf("unable to create account: no password given")
+ }
+ } else {
+ passwd = *args.Passphrase
+ }
am := self.ethereum.AccountManager()
- acc, err := am.NewAccount(args.Passphrase)
+ acc, err := am.NewAccount(passwd)
return acc.Address.Hex(), err
}