cmd/geth: enable DNS discovery by default #20660
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
holiman
reviewed
Feb 12, 2020
cmd/utils/flags.go
Outdated
| @@ -658,6 +658,10 @@ var ( | |||
| Name: "netrestrict", | |||
| Usage: "Restricts network communication to the given IP networks (CIDR masks)", | |||
| } | |||
| DiscoveryURLFlag = cli.StringSliceFlag{ | |||
| Name: "discovery-urls", | |||
There was a problem hiding this comment.
Might be better to use discovery.urls -- in case we want any more flags surrounding discovery later on
| @@ -82,6 +86,8 @@ func (c Config) MarshalTOML() (interface{}, error) { | |||
| enc.RPCGasCap = c.RPCGasCap | |||
| enc.Checkpoint = c.Checkpoint | |||
| enc.CheckpointOracle = c.CheckpointOracle | |||
| enc.OverrideIstanbul = c.OverrideIstanbul | |||
| enc.OverrideMuirGlacier = c.OverrideMuirGlacier | |||
There was a problem hiding this comment.
As far as I can recall, we don't toml:ize the overrides, because they should only be applied when explicitly called for, not "accidentally" remembered by a config file
There was a problem hiding this comment.
In that case you need to add toml:"-" next time. I will send a PR to remove them after this PR since they're not needed anymore either way (comment says "delete after the fork").
holiman
approved these changes
Feb 13, 2020
7 tasks
enriquefynn
pushed a commit
to enriquefynn/go-ethereum
that referenced
this pull request
Mar 10, 2021
* node: expose config in service context * eth: integrate p2p/dnsdisc * cmd/geth: add some DNS flags * eth: remove DNS URLs * cmd/utils: configure DNS names for testnets * params: update DNS URLs * cmd/geth: configure mainnet DNS * cmd/utils: rename DNS flag and fix flag processing * cmd/utils: remove debug print * node: fix test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change adds auto-configuration of DNS discovery URLs for supported networks.
Users can override the enrtree:// entry points using the
--discovery-urlsflag (suggestions forbetter names are welcome). Package eth applies this setting by injecting nodes from the given DNS roots as dial candidates.
The change works as-is, but will work a lot better in combination with #20592 because nodes found through DNS will be dialed faster.
The default lists live on the ethdisco.net domain and their content is tracked
at https://github.com/ethereum/discv4-dns-lists