diff options
| author | Felix Lange <fjl@twurst.com> | 2015-08-28 19:14:51 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-08-28 19:14:51 +0800 |
| commit | 2d1ced87596b8ea1b33bb5474c9ca042be42824f (patch) | |
| tree | 2f263eccdc260179ac5dda709d935ee2a7eac6d2 | |
| parent | 6ec13e7e2bab1ebdb580819a48629055bbbb5fb3 (diff) | |
| parent | 39e956060095801b11766c6788dd5b7a5d0589b6 (diff) | |
| download | dexon-2d1ced87596b8ea1b33bb5474c9ca042be42824f.tar dexon-2d1ced87596b8ea1b33bb5474c9ca042be42824f.tar.gz dexon-2d1ced87596b8ea1b33bb5474c9ca042be42824f.tar.bz2 dexon-2d1ced87596b8ea1b33bb5474c9ca042be42824f.tar.lz dexon-2d1ced87596b8ea1b33bb5474c9ca042be42824f.tar.xz dexon-2d1ced87596b8ea1b33bb5474c9ca042be42824f.tar.zst dexon-2d1ced87596b8ea1b33bb5474c9ca042be42824f.zip | |
Merge pull request #1739 from bas-vk/empty-password
rpc/api allow empty password
| -rw-r--r-- | rpc/api/personal.go | 4 | ||||
| -rw-r--r-- | rpc/api/personal_args.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rpc/api/personal.go b/rpc/api/personal.go index 1b0dea330..1fb412612 100644 --- a/rpc/api/personal.go +++ b/rpc/api/personal.go @@ -110,7 +110,7 @@ func (self *personalApi) UnlockAccount(req *shared.Request) (interface{}, error) return nil, shared.NewDecodeParamError(err.Error()) } - if len(args.Passphrase) == 0 { + if args.Passphrase == nil { fe := self.xeth.Frontend() if fe == nil { return false, fmt.Errorf("No password provided") @@ -121,6 +121,6 @@ func (self *personalApi) UnlockAccount(req *shared.Request) (interface{}, error) am := self.ethereum.AccountManager() addr := common.HexToAddress(args.Address) - err := am.TimedUnlock(addr, args.Passphrase, time.Duration(args.Duration)*time.Second) + err := am.TimedUnlock(addr, *args.Passphrase, time.Duration(args.Duration)*time.Second) return err == nil, err } diff --git a/rpc/api/personal_args.go b/rpc/api/personal_args.go index 89419029b..73dc6285e 100644 --- a/rpc/api/personal_args.go +++ b/rpc/api/personal_args.go @@ -46,7 +46,7 @@ func (args *NewAccountArgs) UnmarshalJSON(b []byte) (err error) { type UnlockAccountArgs struct { Address string - Passphrase string + Passphrase *string Duration int } @@ -70,7 +70,7 @@ func (args *UnlockAccountArgs) UnmarshalJSON(b []byte) (err error) { if len(obj) >= 2 && obj[1] != nil { if passphrasestr, ok := obj[1].(string); ok { - args.Passphrase = passphrasestr + args.Passphrase = &passphrasestr } else { return shared.NewInvalidTypeError("passphrase", "not a string") } |