aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-05-27 08:07:03 +0800
committerobscuren <geffobscura@gmail.com>2015-05-27 08:07:03 +0800
commit70867904a0255bd044851585a9ad2dc34391ced2 (patch)
tree9c5dfc6a9b8944c37f874a81cc9f8fd3d697ad4e /cmd/utils
parentceea1a7051ddc7d2660117204aeb3392b7cf8314 (diff)
parent2c532a7255919bc09e01cca6866bfc15682509a3 (diff)
downloadgo-tangerine-70867904a0255bd044851585a9ad2dc34391ced2.tar
go-tangerine-70867904a0255bd044851585a9ad2dc34391ced2.tar.gz
go-tangerine-70867904a0255bd044851585a9ad2dc34391ced2.tar.bz2
go-tangerine-70867904a0255bd044851585a9ad2dc34391ced2.tar.lz
go-tangerine-70867904a0255bd044851585a9ad2dc34391ced2.tar.xz
go-tangerine-70867904a0255bd044851585a9ad2dc34391ced2.tar.zst
go-tangerine-70867904a0255bd044851585a9ad2dc34391ced2.zip
Merge branch 'release/0.9.25'v0.9.25
Diffstat (limited to 'cmd/utils')
-rw-r--r--cmd/utils/flags.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index cb774aa5b..155110ddc 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -235,6 +235,10 @@ var (
Usage: "NAT port mapping mechanism (any|none|upnp|pmp|extip:<IP>)",
Value: "any",
}
+ NoDiscoverFlag = cli.BoolFlag{
+ Name: "nodiscover",
+ Usage: "Disables the peer discovery mechanism (manual peer addition)",
+ }
WhisperEnabledFlag = cli.BoolFlag{
Name: "shh",
Usage: "Enable whisper",
@@ -312,6 +316,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
Port: ctx.GlobalString(ListenPortFlag.Name),
NAT: GetNAT(ctx),
NatSpec: ctx.GlobalBool(NatspecEnabledFlag.Name),
+ Discovery: !ctx.GlobalBool(NoDiscoverFlag.Name),
NodeKey: GetNodeKey(ctx),
Shh: ctx.GlobalBool(WhisperEnabledFlag.Name),
Dial: true,
@@ -320,7 +325,6 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
SolcPath: ctx.GlobalString(SolcPathFlag.Name),
AutoDAG: ctx.GlobalBool(AutoDAGFlag.Name) || ctx.GlobalBool(MiningEnabledFlag.Name),
}
-
}
func GetChain(ctx *cli.Context) (*core.ChainManager, common.Database, common.Database) {