mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 06:06:44 +00:00
Merge pull request #1495 from maticnetwork/krishang/cmd-enable-v5disc
cli,p2p: enable discv5 by default
This commit is contained in:
Krishang Shah
GitHub
commit
8e61d1307b
20 changed files with 31 additions and 30 deletions
|
|
@ -39,7 +39,7 @@ syncmode = "full"
|
|||
# nodekeyhex = ""
|
||||
[p2p.discovery]
|
||||
# v4disc = true
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
bootnodes = ["enode://b8f1cc9c5d4403703fbf377116469667d2b1823c0daf16b7250aa576bacf399e42c3930ccfcb02c5df6879565a2b8931335565f0e8d3f8e72385ecf4a4bf160a@3.36.224.80:30303", "enode://8729e0c825f3d9cad382555f3e46dcff21af323e89025a0e6312df541f4a9e73abfa562d64906f5e59c51fe6f0501b3e61b07979606c56329c020ed739910759@54.194.245.5:30303"]
|
||||
# Uncomment below `bootnodes` field for Amoy
|
||||
# bootnodes = ["enode://bce861be777e91b0a5a49d58a51e14f32f201b4c6c2d1fbea6c7a1f14756cbb3f931f3188d6b65de8b07b53ff28d03b6e366d09e56360d2124a9fc5a15a0913d@54.217.171.196:30303", "enode://4a3dc0081a346d26a73d79dd88216a9402d2292318e2db9947dbc97ea9c4afb2498dc519c0af04420dc13a238c279062da0320181e7c1461216ce4513bfd40bf@13.251.184.185:30303"]
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ devfakeauthor = false # Run miner without validator set authorization
|
|||
txannouncementonly = false # Whether to only announce transactions to peers
|
||||
[p2p.discovery]
|
||||
v4disc = true # Enables the V4 discovery mechanism
|
||||
v5disc = false # Enables the experimental RLPx V5 (Topic Discovery) mechanism
|
||||
v5disc = true # Enables the V5 discovery mechanism
|
||||
bootnodes = [] # Comma separated enode URLs for P2P discovery bootstrap
|
||||
bootnodesv4 = [] # List of initial v4 bootnodes
|
||||
bootnodesv5 = [] # List of initial v5 bootnodes
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ The ```bor server``` command runs the Bor client.
|
|||
|
||||
- ```bor.heimdall```: URL of Heimdall service (default: http://localhost:1317)
|
||||
|
||||
- ```bor.heimdalltimeout```: Timeout of Heimdall service (default: 5s)
|
||||
|
||||
- ```bor.heimdallgRPC```: Address of Heimdall gRPC service
|
||||
|
||||
- ```bor.heimdalltimeout```: Timeout period for bor's outgoing requests to heimdall (default: 5s)
|
||||
|
||||
- ```bor.logs```: Enables bor log retrieval (default: false)
|
||||
|
||||
- ```bor.runheimdall```: Run Heimdall service as a child process (default: false)
|
||||
|
|
@ -22,7 +22,7 @@ The ```bor server``` command runs the Bor client.
|
|||
|
||||
- ```bor.withoutheimdall```: Run without Heimdall service (for testing purpose) (default: false)
|
||||
|
||||
- ```chain```: Name of the chain to sync ('amoy', 'mainnet') or path to a genesis file (default: mainnet)
|
||||
- ```chain```: Name of the chain to sync ('amoy', 'mumbai', 'mainnet') or path to a genesis file (default: mainnet)
|
||||
|
||||
- ```config```: Path to the TOML configuration file
|
||||
|
||||
|
|
@ -240,13 +240,13 @@ The ```bor server``` command runs the Bor client.
|
|||
|
||||
- ```port```: Network listening port (default: 30303)
|
||||
|
||||
- ```txarrivalwait```: Maximum duration to wait for a transaction before explicitly requesting it (default: 500ms)
|
||||
|
||||
- ```txannouncementonly```: Whether to only announce transactions to peers (default: false)
|
||||
|
||||
- ```txarrivalwait```: Maximum duration to wait for a transaction before explicitly requesting it (default: 500ms)
|
||||
|
||||
- ```v4disc```: Enables the V4 discovery mechanism (default: true)
|
||||
|
||||
- ```v5disc```: Enables the experimental RLPx V5 (Topic Discovery) mechanism (default: false)
|
||||
- ```v5disc```: Enables the V5 discovery mechanism (default: true)
|
||||
|
||||
### Sealer Options
|
||||
|
||||
|
|
|
|||
|
|
@ -231,8 +231,9 @@ type P2PDiscovery struct {
|
|||
// DiscoveryV4 specifies whether V4 discovery should be started.
|
||||
DiscoveryV4 bool `hcl:"v4disc,optional" toml:"v4disc,optional"`
|
||||
|
||||
// V5Enabled is used to enable disc v5 discovery mode
|
||||
V5Enabled bool `hcl:"v5disc,optional" toml:"v5disc,optional"`
|
||||
// DiscoveryV5 specifies whether the new topic-discovery based V5 discovery
|
||||
// protocol should be started or not.
|
||||
DiscoveryV5 bool `hcl:"v5disc,optional" toml:"v5disc,optional"`
|
||||
|
||||
// Bootnodes is the list of initial bootnodes
|
||||
Bootnodes []string `hcl:"bootnodes,optional" toml:"bootnodes,optional"`
|
||||
|
|
@ -639,7 +640,7 @@ func DefaultConfig() *Config {
|
|||
TxAnnouncementOnly: false,
|
||||
Discovery: &P2PDiscovery{
|
||||
DiscoveryV4: true,
|
||||
V5Enabled: false,
|
||||
DiscoveryV5: true,
|
||||
Bootnodes: []string{},
|
||||
BootnodesV4: []string{},
|
||||
BootnodesV5: []string{},
|
||||
|
|
@ -1351,7 +1352,7 @@ func (c *Config) buildNode() (*node.Config, error) {
|
|||
MaxPendingPeers: int(c.P2P.MaxPendPeers),
|
||||
ListenAddr: c.P2P.Bind + ":" + strconv.Itoa(int(c.P2P.Port)),
|
||||
DiscoveryV4: c.P2P.Discovery.DiscoveryV4,
|
||||
DiscoveryV5: c.P2P.Discovery.V5Enabled,
|
||||
DiscoveryV5: c.P2P.Discovery.DiscoveryV5,
|
||||
TxArrivalWait: c.P2P.TxArrivalWait,
|
||||
TxAnnouncementOnly: c.P2P.TxAnnouncementOnly,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -800,9 +800,9 @@ func (c *Command) Flags(config *Config) *flagset.Flagset {
|
|||
})
|
||||
f.BoolFlag(&flagset.BoolFlag{
|
||||
Name: "v5disc",
|
||||
Usage: "Enables the experimental RLPx V5 (Topic Discovery) mechanism",
|
||||
Value: &c.cliConfig.P2P.Discovery.V5Enabled,
|
||||
Default: c.cliConfig.P2P.Discovery.V5Enabled,
|
||||
Usage: "Enables the V5 discovery mechanism",
|
||||
Value: &c.cliConfig.P2P.Discovery.DiscoveryV5,
|
||||
Default: c.cliConfig.P2P.Discovery.DiscoveryV5,
|
||||
Group: "P2P",
|
||||
})
|
||||
f.DurationFlag(&flagset.DurationFlag{
|
||||
|
|
|
|||
2
internal/cli/server/testdata/default.toml
vendored
2
internal/cli/server/testdata/default.toml
vendored
|
|
@ -39,7 +39,7 @@ devfakeauthor = false
|
|||
txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
v4disc = true
|
||||
v5disc = false
|
||||
v5disc = true
|
||||
bootnodes = []
|
||||
bootnodesv4 = []
|
||||
bootnodesv5 = []
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ gcmode = "archive"
|
|||
# txannouncementonly = false
|
||||
# [p2p.discovery]
|
||||
# v4disc = true
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://e4fb013061eba9a2c6fb0a41bbd4149f4808f0fb7e88ec55d7163f19a6f02d64d0ce5ecc81528b769ba552a7068057432d44ab5e9e42842aff5b4709aa2c3f3b@34.89.75.187:30303", "enode://a49da6300403cf9b31e30502eb22c142ba4f77c9dda44990bccce9f2121c3152487ee95ee55c6b92d4cdce77845e40f59fd927da70ea91cf935b23e262236d75@34.142.43.249:30303" ]
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ syncmode = "full"
|
|||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v4disc = true
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://e4fb013061eba9a2c6fb0a41bbd4149f4808f0fb7e88ec55d7163f19a6f02d64d0ce5ecc81528b769ba552a7068057432d44ab5e9e42842aff5b4709aa2c3f3b@34.89.75.187:30303", "enode://a49da6300403cf9b31e30502eb22c142ba4f77c9dda44990bccce9f2121c3152487ee95ee55c6b92d4cdce77845e40f59fd927da70ea91cf935b23e262236d75@34.142.43.249:30303" ]
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ syncmode = "full"
|
|||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v4disc = true
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://e4fb013061eba9a2c6fb0a41bbd4149f4808f0fb7e88ec55d7163f19a6f02d64d0ce5ecc81528b769ba552a7068057432d44ab5e9e42842aff5b4709aa2c3f3b@34.89.75.187:30303", "enode://a49da6300403cf9b31e30502eb22c142ba4f77c9dda44990bccce9f2121c3152487ee95ee55c6b92d4cdce77845e40f59fd927da70ea91cf935b23e262236d75@34.142.43.249:30303" ]
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ syncmode = "full"
|
|||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v4disc = true
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://e4fb013061eba9a2c6fb0a41bbd4149f4808f0fb7e88ec55d7163f19a6f02d64d0ce5ecc81528b769ba552a7068057432d44ab5e9e42842aff5b4709aa2c3f3b@34.89.75.187:30303", "enode://a49da6300403cf9b31e30502eb22c142ba4f77c9dda44990bccce9f2121c3152487ee95ee55c6b92d4cdce77845e40f59fd927da70ea91cf935b23e262236d75@34.142.43.249:30303" ]
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ syncmode = "full"
|
|||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v4disc = true
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://e4fb013061eba9a2c6fb0a41bbd4149f4808f0fb7e88ec55d7163f19a6f02d64d0ce5ecc81528b769ba552a7068057432d44ab5e9e42842aff5b4709aa2c3f3b@34.89.75.187:30303", "enode://a49da6300403cf9b31e30502eb22c142ba4f77c9dda44990bccce9f2121c3152487ee95ee55c6b92d4cdce77845e40f59fd927da70ea91cf935b23e262236d75@34.142.43.249:30303" ]
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ syncmode = "full"
|
|||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v4disc = true
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://e4fb013061eba9a2c6fb0a41bbd4149f4808f0fb7e88ec55d7163f19a6f02d64d0ce5ecc81528b769ba552a7068057432d44ab5e9e42842aff5b4709aa2c3f3b@34.89.75.187:30303", "enode://a49da6300403cf9b31e30502eb22c142ba4f77c9dda44990bccce9f2121c3152487ee95ee55c6b92d4cdce77845e40f59fd927da70ea91cf935b23e262236d75@34.142.43.249:30303" ]
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ syncmode = "full"
|
|||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v4disc = true
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://e4fb013061eba9a2c6fb0a41bbd4149f4808f0fb7e88ec55d7163f19a6f02d64d0ce5ecc81528b769ba552a7068057432d44ab5e9e42842aff5b4709aa2c3f3b@34.89.75.187:30303", "enode://a49da6300403cf9b31e30502eb22c142ba4f77c9dda44990bccce9f2121c3152487ee95ee55c6b92d4cdce77845e40f59fd927da70ea91cf935b23e262236d75@34.142.43.249:30303" ]
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ gcmode = "archive"
|
|||
# txarrivalwait = "500ms"
|
||||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://0ef8758cafc0063405f3f31fe22f2a3b566aa871bd7cd405e35954ec8aa7237c21e1ccc1f65f1b6099ab36db029362bc2fecf001a771b3d9803bbf1968508cef@35.197.249.21:30303", "enode://c9c8c18cde48b41d46ced0c564496aef721a9b58f8724025a0b1f3f26f1b826f31786f890f8f8781e18b16dbb3c7bff805c7304d1273ac11630ed25a3f0dc41c@34.89.39.114:30303" ]
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ syncmode = "full"
|
|||
# txarrivalwait = "500ms"
|
||||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://0ef8758cafc0063405f3f31fe22f2a3b566aa871bd7cd405e35954ec8aa7237c21e1ccc1f65f1b6099ab36db029362bc2fecf001a771b3d9803bbf1968508cef@35.197.249.21:30303", "enode://c9c8c18cde48b41d46ced0c564496aef721a9b58f8724025a0b1f3f26f1b826f31786f890f8f8781e18b16dbb3c7bff805c7304d1273ac11630ed25a3f0dc41c@34.89.39.114:30303" ]
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ syncmode = "full"
|
|||
# txarrivalwait = "500ms"
|
||||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://0ef8758cafc0063405f3f31fe22f2a3b566aa871bd7cd405e35954ec8aa7237c21e1ccc1f65f1b6099ab36db029362bc2fecf001a771b3d9803bbf1968508cef@35.197.249.21:30303", "enode://c9c8c18cde48b41d46ced0c564496aef721a9b58f8724025a0b1f3f26f1b826f31786f890f8f8781e18b16dbb3c7bff805c7304d1273ac11630ed25a3f0dc41c@34.89.39.114:30303" ]
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ syncmode = "full"
|
|||
# txarrivalwait = "500ms"
|
||||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://0ef8758cafc0063405f3f31fe22f2a3b566aa871bd7cd405e35954ec8aa7237c21e1ccc1f65f1b6099ab36db029362bc2fecf001a771b3d9803bbf1968508cef@35.197.249.21:30303", "enode://c9c8c18cde48b41d46ced0c564496aef721a9b58f8724025a0b1f3f26f1b826f31786f890f8f8781e18b16dbb3c7bff805c7304d1273ac11630ed25a3f0dc41c@34.89.39.114:30303" ]
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ syncmode = "full"
|
|||
# txarrivalwait = "500ms"
|
||||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://0ef8758cafc0063405f3f31fe22f2a3b566aa871bd7cd405e35954ec8aa7237c21e1ccc1f65f1b6099ab36db029362bc2fecf001a771b3d9803bbf1968508cef@35.197.249.21:30303", "enode://c9c8c18cde48b41d46ced0c564496aef721a9b58f8724025a0b1f3f26f1b826f31786f890f8f8781e18b16dbb3c7bff805c7304d1273ac11630ed25a3f0dc41c@34.89.39.114:30303" ]
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ syncmode = "full"
|
|||
# txarrivalwait = "500ms"
|
||||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv4 = []
|
||||
# bootnodesv5 = []
|
||||
bootnodes = [ "enode://0ef8758cafc0063405f3f31fe22f2a3b566aa871bd7cd405e35954ec8aa7237c21e1ccc1f65f1b6099ab36db029362bc2fecf001a771b3d9803bbf1968508cef@35.197.249.21:30303", "enode://c9c8c18cde48b41d46ced0c564496aef721a9b58f8724025a0b1f3f26f1b826f31786f890f8f8781e18b16dbb3c7bff805c7304d1273ac11630ed25a3f0dc41c@34.89.39.114:30303" ]
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ syncmode = "full"
|
|||
# txarrivalwait = "500ms"
|
||||
# txannouncementonly = false
|
||||
[p2p.discovery]
|
||||
# v5disc = false
|
||||
# v5disc = true
|
||||
# bootnodesv5 = []
|
||||
# bootnodesv4 = []
|
||||
bootnodes = [ "enode://0ef8758cafc0063405f3f31fe22f2a3b566aa871bd7cd405e35954ec8aa7237c21e1ccc1f65f1b6099ab36db029362bc2fecf001a771b3d9803bbf1968508cef@35.197.249.21:30303", "enode://c9c8c18cde48b41d46ced0c564496aef721a9b58f8724025a0b1f3f26f1b826f31786f890f8f8781e18b16dbb3c7bff805c7304d1273ac11630ed25a3f0dc41c@34.89.39.114:30303" ]
|
||||
|
|
|
|||
Loading…
Reference in a new issue