forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd/geth: configure mainnet DNS

Browse source
This commit is contained in:
Felix Lange 2020-02-12 13:55:42 +01:00
parent 342ade82f6
commit 7ca40ec6aa
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/geth/main.go
View file

@ -131,7 +131,7 @@ var (
utils.NetrestrictFlag, utils.NetrestrictFlag,
utils.NodeKeyFileFlag, utils.NodeKeyFileFlag,
utils.NodeKeyHexFlag, utils.NodeKeyHexFlag,
utils.DisableDNSFlag, utils.DiscoveryURLFlag,
utils.DeveloperFlag, utils.DeveloperFlag,
utils.DeveloperPeriodFlag, utils.DeveloperPeriodFlag,
utils.TestnetFlag, utils.TestnetFlag,

2
cmd/geth/usage.go
View file

@ -191,7 +191,7 @@ var AppHelpFlagGroups = []flagGroup{
utils.NetrestrictFlag, utils.NetrestrictFlag,
utils.NodeKeyFileFlag, utils.NodeKeyFileFlag,
utils.NodeKeyHexFlag, utils.NodeKeyHexFlag,
utils.DisableDNSFlag, utils.DiscoveryURLFlag,
}, },
}, },
{ {

17
cmd/utils/flags.go
View file

@ -658,9 +658,9 @@ var (
Name: "netrestrict", Name: "netrestrict",
Usage: "Restricts network communication to the given IP networks (CIDR masks)", Usage: "Restricts network communication to the given IP networks (CIDR masks)",
} }
DisableDNSFlag = cli.BoolFlag{ DiscoveryURLFlag = cli.StringSliceFlag{
Name: "nodns", Name: "discovery-urls",
Usage: "disables DNS-based node discovery", Usage: "Overrides DNS discovery entry points",
} }
// ATM the url is left to the user and deployment to // ATM the url is left to the user and deployment to
@ -1481,8 +1481,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
if ctx.GlobalIsSet(RPCGlobalGasCap.Name) { if ctx.GlobalIsSet(RPCGlobalGasCap.Name) {
cfg.RPCGasCap = new(big.Int).SetUint64(ctx.GlobalUint64(RPCGlobalGasCap.Name)) cfg.RPCGasCap = new(big.Int).SetUint64(ctx.GlobalUint64(RPCGlobalGasCap.Name))
} }
// if ctx.GlobalIsSet(DiscoveryURLFlag.Name) { if ctx.GlobalIsSet(DiscoveryURLFlag.Name) {
// } cfg.DiscoveryURLs = ctx.GlobalStringSlice(DiscoveryURLFlag.Name)
}
// Override any default configs for hard coded networks. // Override any default configs for hard coded networks.
switch { switch {
@ -1530,13 +1531,17 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
if !ctx.GlobalIsSet(MinerGasPriceFlag.Name) && !ctx.GlobalIsSet(MinerLegacyGasPriceFlag.Name) { if !ctx.GlobalIsSet(MinerGasPriceFlag.Name) && !ctx.GlobalIsSet(MinerLegacyGasPriceFlag.Name) {
cfg.Miner.GasPrice = big.NewInt(1) cfg.Miner.GasPrice = big.NewInt(1)
} }
default:
if cfg.NetworkId == 1 {
setDNSDiscoveryDefaults(ctx, cfg, params.KnownDNSNetworks[params.MainnetGenesisHash])
}
} }
} }
// setDNSDiscoveryDefaults configures DNS discovery with the given URL if // setDNSDiscoveryDefaults configures DNS discovery with the given URL if
// no URL is set. // no URL is set.
func setDNSDiscoveryDefaults(ctx *cli.Context, cfg *eth.Config, url string) { func setDNSDiscoveryDefaults(ctx *cli.Context, cfg *eth.Config, url string) {
if len(cfg.DiscoveryURLs) > 0 || ctx.GlobalIsSet(DisableDNSFlag.Name) { if len(cfg.DiscoveryURLs) > 0 {
return return
} }
cfg.DiscoveryURLs = []string{url} cfg.DiscoveryURLs = []string{url}