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

internal/ethapi: fix duration parameter of personal_unlockAccount (#3542)

Browse Source
This commit is contained in:
Felix Lange 2017-01-11 13:20:24 +01:00 committed by GitHub
parent b52fde7cf7
commit 8820d97039
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/ethapi/api.go
View File

@ -19,7 +19,9 @@ package ethapi
import ( import (
"bytes" "bytes"
"encoding/hex" "encoding/hex"
"errors"
"fmt" "fmt"
"math"
"math/big" "math/big"
"strings" "strings"
"time" "time"
@ -237,17 +239,18 @@ func (s *PrivateAccountAPI) ImportRawKey(privkey string, password string) (commo
// UnlockAccount will unlock the account associated with the given address with // UnlockAccount will unlock the account associated with the given address with
// the given password for duration seconds. If duration is nil it will use a // the given password for duration seconds. If duration is nil it will use a
// default of 300 seconds. It returns an indication if the account was unlocked. // default of 300 seconds. It returns an indication if the account was unlocked.
func (s *PrivateAccountAPI) UnlockAccount(addr common.Address, password string, duration *hexutil.Uint) (bool, error) { func (s *PrivateAccountAPI) UnlockAccount(addr common.Address, password string, duration *uint64) (bool, error) {
const max = uint64(time.Duration(math.MaxInt64) / time.Second)
var d time.Duration var d time.Duration
if duration == nil { if duration == nil {
d = 300 * time.Second d = 300 * time.Second
} else if *duration > max {
return false, errors.New("unlock duration too large")
} else { } else {
d = time.Duration(*duration) * time.Second d = time.Duration(*duration) * time.Second
} }
if err := s.am.TimedUnlock(accounts.Account{Address: addr}, password, d); err != nil { err := s.am.TimedUnlock(accounts.Account{Address: addr}, password, d)
return false, err return err == nil, err
}
return true, nil
} }
// LockAccount will lock the account associated with the given address when it's unlocked. // LockAccount will lock the account associated with the given address when it's unlocked.