From 930e82d7f4e6e0e7e90d36569f294745e1547a1e Mon Sep 17 00:00:00 2001
From: Marius van der Wijden <m.vanderwijden@live.de>
Date: Mon, 11 May 2020 10:16:32 +0200
Subject: [PATCH] params, cmd/utils: remove outdated discv5 bootnodes,
deprecate flags (#20949)
* params: remove outdated discv5 bootnodes
* cmd/utils: deprecated bootnodesv4/v5 flags
---
cmd/geth/main.go | 4 ++--
cmd/geth/usage.go | 4 ++--
cmd/utils/flags.go | 28 ++++++++++------------------
cmd/utils/flags_legacy.go | 10 ++++++++++
mobile/params.go | 4 ++--
params/bootnodes.go | 9 ---------
6 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 2df8e05a2..b70bcdff5 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -61,8 +61,8 @@ var (
utils.UnlockedAccountFlag,
utils.PasswordFileFlag,
utils.BootnodesFlag,
- utils.BootnodesV4Flag,
- utils.BootnodesV5Flag,
+ utils.LegacyBootnodesV4Flag,
+ utils.LegacyBootnodesV5Flag,
utils.DataDirFlag,
utils.AncientFlag,
utils.KeyStoreDirFlag,
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index c31c5d965..e1cd37a24 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -183,8 +183,8 @@ var AppHelpFlagGroups = []flagGroup{
Name: "NETWORKING",
Flags: []cli.Flag{
utils.BootnodesFlag,
- utils.BootnodesV4Flag,
- utils.BootnodesV5Flag,
+ utils.LegacyBootnodesV4Flag,
+ utils.LegacyBootnodesV5Flag,
utils.DNSDiscoveryFlag,
utils.ListenPortFlag,
utils.MaxPeersFlag,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index fbb030be9..9f53f2419 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -595,17 +595,7 @@ var (
}
BootnodesFlag = cli.StringFlag{
Name: "bootnodes",
- Usage: "Comma separated enode URLs for P2P discovery bootstrap (set v4+v5 instead for light servers)",
- Value: "",
- }
- BootnodesV4Flag = cli.StringFlag{
- Name: "bootnodesv4",
- Usage: "Comma separated enode URLs for P2P v4 discovery bootstrap (light server, full nodes)",
- Value: "",
- }
- BootnodesV5Flag = cli.StringFlag{
- Name: "bootnodesv5",
- Usage: "Comma separated enode URLs for P2P v5 discovery bootstrap (light server, light nodes)",
+ Usage: "Comma separated enode URLs for P2P discovery bootstrap",
Value: "",
}
NodeKeyFileFlag = cli.StringFlag{
@@ -793,9 +783,9 @@ func setNodeUserIdent(ctx *cli.Context, cfg *node.Config) {
func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) {
urls := params.MainnetBootnodes
switch {
- case ctx.GlobalIsSet(BootnodesFlag.Name) || ctx.GlobalIsSet(BootnodesV4Flag.Name):
- if ctx.GlobalIsSet(BootnodesV4Flag.Name) {
- urls = splitAndTrim(ctx.GlobalString(BootnodesV4Flag.Name))
+ case ctx.GlobalIsSet(BootnodesFlag.Name) || ctx.GlobalIsSet(LegacyBootnodesV4Flag.Name):
+ if ctx.GlobalIsSet(LegacyBootnodesV4Flag.Name) {
+ urls = splitAndTrim(ctx.GlobalString(LegacyBootnodesV4Flag.Name))
} else {
urls = splitAndTrim(ctx.GlobalString(BootnodesFlag.Name))
}
@@ -825,14 +815,16 @@ func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) {
// setBootstrapNodesV5 creates a list of bootstrap nodes from the command line
// flags, reverting to pre-configured ones if none have been specified.
func setBootstrapNodesV5(ctx *cli.Context, cfg *p2p.Config) {
- urls := params.DiscoveryV5Bootnodes
+ urls := params.MainnetBootnodes
switch {
- case ctx.GlobalIsSet(BootnodesFlag.Name) || ctx.GlobalIsSet(BootnodesV5Flag.Name):
- if ctx.GlobalIsSet(BootnodesV5Flag.Name) {
- urls = splitAndTrim(ctx.GlobalString(BootnodesV5Flag.Name))
+ case ctx.GlobalIsSet(BootnodesFlag.Name) || ctx.GlobalIsSet(LegacyBootnodesV5Flag.Name):
+ if ctx.GlobalIsSet(LegacyBootnodesV5Flag.Name) {
+ urls = splitAndTrim(ctx.GlobalString(LegacyBootnodesV5Flag.Name))
} else {
urls = splitAndTrim(ctx.GlobalString(BootnodesFlag.Name))
}
+ case ctx.GlobalBool(RopstenFlag.Name):
+ urls = params.RopstenBootnodes
case ctx.GlobalBool(RinkebyFlag.Name):
urls = params.RinkebyBootnodes
case ctx.GlobalBool(GoerliFlag.Name):
diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go
index a5520da9f..c39664d24 100644
--- a/cmd/utils/flags_legacy.go
+++ b/cmd/utils/flags_legacy.go
@@ -148,6 +148,16 @@ var (
Usage: "Suggested gas price is the given percentile of a set of recent transaction gas prices (deprecated, use --gpo.percentile)",
Value: eth.DefaultConfig.GPO.Percentile,
}
+ LegacyBootnodesV4Flag = cli.StringFlag{
+ Name: "bootnodesv4",
+ Usage: "Comma separated enode URLs for P2P v4 discovery bootstrap (light server, full nodes) (deprecated, use --bootnodes)",
+ Value: "",
+ }
+ LegacyBootnodesV5Flag = cli.StringFlag{
+ Name: "bootnodesv5",
+ Usage: "Comma separated enode URLs for P2P v5 discovery bootstrap (light server, light nodes) (deprecated, use --bootnodes)",
+ Value: "",
+ }
)
// showDeprecated displays deprecated flags that will be soon removed from the codebase.
diff --git a/mobile/params.go b/mobile/params.go
index 25d3b8565..43ac00474 100644
--- a/mobile/params.go
+++ b/mobile/params.go
@@ -62,8 +62,8 @@ func GoerliGenesis() string {
// FoundationBootnodes returns the enode URLs of the P2P bootstrap nodes operated
// by the foundation running the V5 discovery protocol.
func FoundationBootnodes() *Enodes {
- nodes := &Enodes{nodes: make([]*discv5.Node, len(params.DiscoveryV5Bootnodes))}
- for i, url := range params.DiscoveryV5Bootnodes {
+ nodes := &Enodes{nodes: make([]*discv5.Node, len(params.MainnetBootnodes))}
+ for i, url := range params.MainnetBootnodes {
nodes.nodes[i] = discv5.MustParseNode(url)
}
return nodes
diff --git a/params/bootnodes.go b/params/bootnodes.go
index 5b4c96253..0d72321b0 100644
--- a/params/bootnodes.go
+++ b/params/bootnodes.go
@@ -63,15 +63,6 @@ var GoerliBootnodes = []string{
"enode://a61215641fb8714a373c80edbfa0ea8878243193f57c96eeb44d0bc019ef295abd4e044fd619bfc4c59731a73fb79afe84e9ab6da0c743ceb479cbb6d263fa91@3.11.147.67:30303",
}
-// DiscoveryV5Bootnodes are the enode URLs of the P2P bootstrap nodes for the
-// experimental RLPx v5 topic-discovery network.
-var DiscoveryV5Bootnodes = []string{
- "enode://06051a5573c81934c9554ef2898eb13b33a34b94cf36b202b69fde139ca17a85051979867720d4bdae4323d4943ddf9aeeb6643633aa656e0be843659795007a@35.177.226.168:30303",
- "enode://0cc5f5ffb5d9098c8b8c62325f3797f56509bff942704687b6530992ac706e2cb946b90a34f1f19548cd3c7baccbcaea354531e5983c7d1bc0dee16ce4b6440b@40.118.3.223:30304",
- "enode://1c7a64d76c0334b0418c004af2f67c50e36a3be60b5e4790bdac0439d21603469a85fad36f2473c9a80eb043ae60936df905fa28f1ff614c3e5dc34f15dcd2dc@40.118.3.223:30306",
- "enode://85c85d7143ae8bb96924f2b54f1b3e70d8c4d367af305325d30a61385a432f247d2c75c45c6b4a60335060d072d7f5b35dd1d4c45f76941f62a4f83b6e75daaf@40.118.3.223:30307",
-}
-
const dnsPrefix = "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@"
// These DNS names provide bootstrap connectivity for public testnets and the mainnet.
--
GitLab