From 589f1c85b901b06d0058040a02890518b6aa7ab8 Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 9 Jul 2015 13:55:09 +0100 Subject: [PATCH 1/2] : colon => dash - in keyfile name - slight deviation from ISO8601 for WIN FS compatibility --- crypto/key_store_plain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/key_store_plain.go b/crypto/key_store_plain.go index 428d01e25..8c405ebcd 100644 --- a/crypto/key_store_plain.go +++ b/crypto/key_store_plain.go @@ -189,7 +189,7 @@ func toISO8601(t time.Time) string { } else { tz = fmt.Sprintf("%03d00", offset/3600) } - return fmt.Sprintf("%04d-%02d-%02dT%02d:%02d:%02d.%09d%s", t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second(), t.Nanosecond(), tz) + return fmt.Sprintf("%04d-%02d-%02dT%02d-%02d-%02d.%09d%s", t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second(), t.Nanosecond(), tz) } func getKeyAddresses(keysDirPath string) (addresses []common.Address, err error) { From c3f5403b643f67df4061cb570f3b19ba95f83ba2 Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 9 Jul 2015 14:04:19 +0100 Subject: [PATCH 2/2] fix wallet key duplicate write - how did it get there? mystery. fixes #1411 --- accounts/account_manager.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/accounts/account_manager.go b/accounts/account_manager.go index c9e06261a..2a9d9b0ae 100644 --- a/accounts/account_manager.go +++ b/accounts/account_manager.go @@ -228,8 +228,5 @@ func (am *Manager) ImportPreSaleKey(keyJSON []byte, password string) (acc Accoun if err != nil { return } - if err = am.keyStore.StoreKey(key, password); err != nil { - return - } return Account{Address: key.Address}, nil }