diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-16 06:27:13 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-16 06:27:13 +0800 |
| commit | 1564f1a020b9edc78bc672f8f2df64b3d0dc55c3 (patch) | |
| tree | d898e2b20a6c2e0b5613ae7f669499c5db23b719 /cmd/geth/admin.go | |
| parent | 8e24378cc1acb074b56de75bf0baf6feb7927677 (diff) | |
| parent | 7ea76fcf993f3fecb55233bdcc2409618d9080b9 (diff) | |
| download | dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar.gz dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar.bz2 dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar.lz dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar.xz dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar.zst dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.zip | |
Merge branch 'release/0.9.21'
Diffstat (limited to 'cmd/geth/admin.go')
| -rw-r--r-- | cmd/geth/admin.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index 15923c366..ebdf3512a 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -8,6 +8,7 @@ import ( "strconv" "time" + "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/compiler" @@ -287,7 +288,7 @@ func (js *jsre) startMining(call otto.FunctionCall) otto.Value { return otto.FalseValue() } } else { - threads = 4 + threads = int64(js.ethereum.MinerThreads) } err = js.ethereum.StartMining(int(threads)) @@ -374,6 +375,10 @@ func (js *jsre) unlock(call otto.FunctionCall) otto.Value { fmt.Println(err) return otto.FalseValue() } + if seconds == 0 { + seconds = accounts.DefaultAccountUnlockDuration + } + arg := call.Argument(1) var passphrase string if arg.IsUndefined() { |