aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-04-20 19:01:51 +0800
committerPéter Szilágyi <peterke@gmail.com>2017-04-20 19:01:51 +0800
commit6430e672c99f6d22582b104f8467d4bd8a4b5f6e (patch)
treef320b92a44384fdcc699e925197228f4a4f4ec0d /cmd
parente353f9c0886f0cc13fd01c8b3abf2fa63025c62f (diff)
downloadgo-tangerine-6430e672c99f6d22582b104f8467d4bd8a4b5f6e.tar
go-tangerine-6430e672c99f6d22582b104f8467d4bd8a4b5f6e.tar.gz
go-tangerine-6430e672c99f6d22582b104f8467d4bd8a4b5f6e.tar.bz2
go-tangerine-6430e672c99f6d22582b104f8467d4bd8a4b5f6e.tar.lz
go-tangerine-6430e672c99f6d22582b104f8467d4bd8a4b5f6e.tar.xz
go-tangerine-6430e672c99f6d22582b104f8467d4bd8a4b5f6e.tar.zst
go-tangerine-6430e672c99f6d22582b104f8467d4bd8a4b5f6e.zip
cmd, node: add --nosub and node.Config.NoUSB to disable hw wallets
Diffstat (limited to 'cmd')
-rw-r--r--cmd/geth/main.go1
-rw-r--r--cmd/geth/usage.go1
-rw-r--r--cmd/utils/flags.go7
3 files changed, 9 insertions, 0 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index c2d719d95..ad7b639a3 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -88,6 +88,7 @@ func init() {
utils.BootnodesFlag,
utils.DataDirFlag,
utils.KeyStoreDirFlag,
+ utils.NoUSBFlag,
utils.EthashCacheDirFlag,
utils.EthashCachesInMemoryFlag,
utils.EthashCachesOnDiskFlag,
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index 457728154..9f06a308b 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -67,6 +67,7 @@ var AppHelpFlagGroups = []flagGroup{
configFileFlag,
utils.DataDirFlag,
utils.KeyStoreDirFlag,
+ utils.NoUSBFlag,
utils.NetworkIdFlag,
utils.TestNetFlag,
utils.DevModeFlag,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index b35574c86..af9585bd0 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -115,6 +115,10 @@ var (
Name: "keystore",
Usage: "Directory for the keystore (default = inside the datadir)",
}
+ NoUSBFlag = cli.BoolFlag{
+ Name: "nousb",
+ Usage: "Disables monitoring for and managine USB hardware wallets",
+ }
EthashCacheDirFlag = DirectoryFlag{
Name: "ethash.cachedir",
Usage: "Directory to store the ethash verification caches (default = inside the datadir)",
@@ -729,6 +733,9 @@ func SetNodeConfig(ctx *cli.Context, cfg *node.Config) {
if ctx.GlobalIsSet(LightKDFFlag.Name) {
cfg.UseLightweightKDF = ctx.GlobalBool(LightKDFFlag.Name)
}
+ if ctx.GlobalIsSet(NoUSBFlag.Name) {
+ cfg.NoUSB = ctx.GlobalBool(NoUSBFlag.Name)
+ }
}
func setGPO(ctx *cli.Context, cfg *gasprice.Config) {