aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils/flags.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-12 00:46:58 +0800
committerobscuren <geffobscura@gmail.com>2015-03-12 00:46:58 +0800
commit629f4b1d3cadcf1d43892ae2a0152fec3d185396 (patch)
tree4f48bbeaab928f18113ecd0a9a4fb10483fa8e6a /cmd/utils/flags.go
parent239e17de126a3d7afa29da7ee423ffc79757877f (diff)
parent99bc44cf526b2b9692b230308f3b940e782eea7b (diff)
downloaddexon-629f4b1d3cadcf1d43892ae2a0152fec3d185396.tar
dexon-629f4b1d3cadcf1d43892ae2a0152fec3d185396.tar.gz
dexon-629f4b1d3cadcf1d43892ae2a0152fec3d185396.tar.bz2
dexon-629f4b1d3cadcf1d43892ae2a0152fec3d185396.tar.lz
dexon-629f4b1d3cadcf1d43892ae2a0152fec3d185396.tar.xz
dexon-629f4b1d3cadcf1d43892ae2a0152fec3d185396.tar.zst
dexon-629f4b1d3cadcf1d43892ae2a0152fec3d185396.zip
merge
Diffstat (limited to 'cmd/utils/flags.go')
-rw-r--r--cmd/utils/flags.go14
1 files changed, 11 insertions, 3 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 6372aaa42..5c188a41e 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -99,6 +99,10 @@ var (
Name: "mine",
Usage: "Enable mining",
}
+ UnencryptedKeysFlag = cli.BoolFlag{
+ Name: "unencrypted-keys",
+ Usage: "disable private key disk encryption (for testing)",
+ }
LogFileFlag = cli.StringFlag{
Name: "logfile",
@@ -224,9 +228,13 @@ func GetChain(ctx *cli.Context) (*core.ChainManager, ethutil.Database, ethutil.D
func GetAccountManager(ctx *cli.Context) *accounts.Manager {
dataDir := ctx.GlobalString(DataDirFlag.Name)
- ks := crypto.NewKeyStorePassphrase(path.Join(dataDir, "keys"))
- km := accounts.NewManager(ks)
- return km
+ var ks crypto.KeyStore2
+ if ctx.GlobalBool(UnencryptedKeysFlag.Name) {
+ ks = crypto.NewKeyStorePlain(path.Join(dataDir, "plainkeys"))
+ } else {
+ ks = crypto.NewKeyStorePassphrase(path.Join(dataDir, "keys"))
+ }
+ return accounts.NewManager(ks)
}
func StartRPC(eth *eth.Ethereum, ctx *cli.Context) {