From c4ea921876b0535022882c568b5cc6b0269db7d4 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Mon, 23 Mar 2015 13:00:06 +0000
Subject: import/export accounts - cli: add passwordfile flag - cli: change
unlock flag only takes account - cli: with unlock you are prompted for
password or use passfile with password flag - cli: unlockAccount used in
normal client start (run) and accountExport - cli: getPassword used in
accountCreate and accountImport - accounts: Manager.Import, Manager.Export -
crypto: SaveECDSA (to complement LoadECDSA) to save to file - crypto:
NewKeyFromECDSA added (used in accountImport and New = generated constructor)
---
cmd/utils/flags.go | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'cmd/utils')
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 94b043d73..f94ec3a69 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -104,7 +104,13 @@ var (
}
UnlockedAccountFlag = cli.StringFlag{
Name: "unlock",
- Usage: "Unlock a given account untill this programs exits (address:password)",
+ Usage: "unlock the account given until this program exits (prompts for password).",
+ Value: "",
+ }
+ PasswordFileFlag = cli.StringFlag{
+ Name: "password",
+ Usage: "Password used when saving a new account and unlocking an existing account. If you create a new account make sure you remember this password.",
+ Value: "",
}
// logging and debug settings
--
cgit v1.2.3
From 34d5a6c156a014ce000b4f850f2b0f11533387f0 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Tue, 24 Mar 2015 16:05:27 +0000
Subject: cli: help formatting
---
cmd/utils/flags.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/utils')
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index f94ec3a69..dda409502 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -109,7 +109,7 @@ var (
}
PasswordFileFlag = cli.StringFlag{
Name: "password",
- Usage: "Password used when saving a new account and unlocking an existing account. If you create a new account make sure you remember this password.",
+ Usage: "Path to password file for (un)locking an existing account.",
Value: "",
}
--
cgit v1.2.3
From 7577d1261403dbabdb30e21415d34b4e5da466ec Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Thu, 26 Mar 2015 18:55:39 +0000
Subject: max paranoia mode to UNsupport unencrypted keys entirely - remove
account export functionality from CLI - remove accountExport method, - remove
unencrypted-keys flag from everywhere - improve documentation
---
cmd/utils/flags.go | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
(limited to 'cmd/utils')
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index dda409502..f948cdb06 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -97,14 +97,9 @@ var (
Usage: "Enable mining",
}
- // key settings
- UnencryptedKeysFlag = cli.BoolFlag{
- Name: "unencrypted-keys",
- Usage: "disable private key disk encryption (for testing)",
- }
UnlockedAccountFlag = cli.StringFlag{
Name: "unlock",
- Usage: "unlock the account given until this program exits (prompts for password).",
+ Usage: "unlock the account given until this program exits (prompts for password). '--unlock coinbase' unlocks the primary (coinbase) account",
Value: "",
}
PasswordFileFlag = cli.StringFlag{
@@ -249,12 +244,7 @@ func GetChain(ctx *cli.Context) (*core.ChainManager, common.Database, common.Dat
func GetAccountManager(ctx *cli.Context) *accounts.Manager {
dataDir := ctx.GlobalString(DataDirFlag.Name)
- var ks crypto.KeyStore2
- if ctx.GlobalBool(UnencryptedKeysFlag.Name) {
- ks = crypto.NewKeyStorePlain(path.Join(dataDir, "plainkeys"))
- } else {
- ks = crypto.NewKeyStorePassphrase(path.Join(dataDir, "keys"))
- }
+ ks := crypto.NewKeyStorePassphrase(path.Join(dataDir, "keys"))
return accounts.NewManager(ks)
}
--
cgit v1.2.3