gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
obscuren
2015-03-11 17:46:58 +01:00
parent 239e17de12 99bc44cf52
commit 629f4b1d3c
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/utils/flags.go
View File

@ -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) {