diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 05:42:46 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 05:42:46 +0800 |
| commit | 6bd1f6cc49acd459e61559e5af515da2db2481e5 (patch) | |
| tree | 3e4f7a51ca8e3cb03d24fbe1898578d88fd7456c /cmd/utils | |
| parent | bb12dbe233db2e064715b329b7ba987c76ba3bfa (diff) | |
| parent | b0b0939879b9fb8453ec1c8fa2ceb522e56df3bc (diff) | |
| download | dexon-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar dexon-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.gz dexon-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.bz2 dexon-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.lz dexon-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.xz dexon-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.zst dexon-6bd1f6cc49acd459e61559e5af515da2db2481e5.zip | |
Merge remote-tracking branch 'origin' into rpcargs
Conflicts:
rpc/args.go
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/flags.go | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 94b043d73..f948cdb06 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -97,14 +97,15 @@ 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 a given account untill this programs exits (address:password)", + Usage: "unlock the account given until this program exits (prompts for password). '--unlock coinbase' unlocks the primary (coinbase) account", + Value: "", + } + PasswordFileFlag = cli.StringFlag{ + Name: "password", + Usage: "Path to password file for (un)locking an existing account.", + Value: "", } // logging and debug settings @@ -243,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) } |