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
2d1ced87
Commit
2d1ced87
authored
Aug 28, 2015
by
Felix Lange
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1739 from bas-vk/empty-password
rpc/api allow empty password
parents
6ec13e7e
39e95606
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
personal.go
rpc/api/personal.go
+2
-2
personal_args.go
rpc/api/personal_args.go
+2
-2
No files found.
rpc/api/personal.go
View file @
2d1ced87
...
...
@@ -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
}
rpc/api/personal_args.go
View file @
2d1ced87
...
...
@@ -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"
)
}
...
...
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