diff options
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/admin.go | 5 | ||||
| -rw-r--r-- | cmd/geth/main.go | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index 15923c366..91a336cbb 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" @@ -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() { diff --git a/cmd/geth/main.go b/cmd/geth/main.go index b4d7feed1..725f04efe 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -563,7 +563,7 @@ func upgradeDb(ctx *cli.Context) { bcVersion = core.BlockChainVersion } - filename := fmt.Sprintf("blockchain_%d_%s.chain", bcVersion, time.Now().Format("2006-01-02_15:04:05")) + filename := fmt.Sprintf("blockchain_%d_%s.chain", bcVersion, time.Now().Format("20060102_150405")) exportFile := filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), filename) err = utils.ExportChain(ethereum.ChainManager(), exportFile) |