aboutsummaryrefslogtreecommitdiffstats
path: root/p2p
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-11-09 22:35:04 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-11-15 00:00:14 +0800
commitb61f48e5aad9cf897f5655a0db002a3349109c67 (patch)
tree32b0d7d4a126ee444e1cd563c5d4d8ebadef09ec /p2p
parentde4b39a1a32a61a9683a036b2e27e8df7cd4c9ff (diff)
downloadgo-tangerine-b61f48e5aad9cf897f5655a0db002a3349109c67.tar
go-tangerine-b61f48e5aad9cf897f5655a0db002a3349109c67.tar.gz
go-tangerine-b61f48e5aad9cf897f5655a0db002a3349109c67.tar.bz2
go-tangerine-b61f48e5aad9cf897f5655a0db002a3349109c67.tar.lz
go-tangerine-b61f48e5aad9cf897f5655a0db002a3349109c67.tar.xz
go-tangerine-b61f48e5aad9cf897f5655a0db002a3349109c67.tar.zst
go-tangerine-b61f48e5aad9cf897f5655a0db002a3349109c67.zip
cmd, mobile, node, p2p: surface the discovery V5 bootnodes
Diffstat (limited to 'p2p')
-rw-r--r--p2p/discv5/net.go8
-rw-r--r--p2p/server.go18
2 files changed, 13 insertions, 13 deletions
diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go
index 71eaec3c4..7ad6f1e5b 100644
--- a/p2p/discv5/net.go
+++ b/p2p/discv5/net.go
@@ -60,14 +60,6 @@ func debugLog(s string) {
}
}
-// BootNodes are the enode URLs of the P2P bootstrap nodes for the experimental RLPx v5 "Topic Discovery" network
-// warning: local bootnodes for testing!!!
-var BootNodes = []*Node{
- MustParseNode("enode://0cc5f5ffb5d9098c8b8c62325f3797f56509bff942704687b6530992ac706e2cb946b90a34f1f19548cd3c7baccbcaea354531e5983c7d1bc0dee16ce4b6440b@40.118.3.223:30305"),
- MustParseNode("enode://1c7a64d76c0334b0418c004af2f67c50e36a3be60b5e4790bdac0439d21603469a85fad36f2473c9a80eb043ae60936df905fa28f1ff614c3e5dc34f15dcd2dc@40.118.3.223:30308"),
- MustParseNode("enode://85c85d7143ae8bb96924f2b54f1b3e70d8c4d367af305325d30a61385a432f247d2c75c45c6b4a60335060d072d7f5b35dd1d4c45f76941f62a4f83b6e75daaf@40.118.3.223:30309"),
-}
-
// Network manages the table and all protocol interaction.
type Network struct {
db *nodeDB // database of known nodes
diff --git a/p2p/server.go b/p2p/server.go
index 1e571abf1..7381127dc 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -73,16 +73,26 @@ type Config struct {
// or not. Disabling is usually useful for protocol debugging (manual topology).
Discovery bool
+ // DiscoveryV5 specifies whether the the new topic-discovery based V5 discovery
+ // protocol should be started or not.
DiscoveryV5 bool
+ // Listener address for the V5 discovery protocol UDP traffic.
+ DiscoveryV5Addr string
+
// Name sets the node name of this server.
// Use common.MakeName to create a name that follows existing conventions.
Name string
- // Bootstrap nodes are used to establish connectivity
+ // BootstrapNodes are used to establish connectivity
// with the rest of the network.
BootstrapNodes []*discover.Node
+ // BootstrapNodesV5 are used to establish connectivity
+ // with the rest of the network using the V5 discovery
+ // protocol.
+ BootstrapNodesV5 []*discv5.Node
+
// Static nodes are used as pre-configured connections which are always
// maintained and re-connected on disconnects.
StaticNodes []*discover.Node
@@ -108,8 +118,6 @@ type Config struct {
// the server is started.
ListenAddr string
- ListenAddrV5 string
-
// If set to a non-nil value, the given NAT port mapper
// is used to make the listening port available to the
// Internet.
@@ -359,11 +367,11 @@ func (srv *Server) Start() (err error) {
}
if srv.DiscoveryV5 {
- ntab, err := discv5.ListenUDP(srv.PrivateKey, srv.ListenAddrV5, srv.NAT, "") //srv.NodeDatabase)
+ ntab, err := discv5.ListenUDP(srv.PrivateKey, srv.DiscoveryV5Addr, srv.NAT, "") //srv.NodeDatabase)
if err != nil {
return err
}
- if err := ntab.SetFallbackNodes(discv5.BootNodes); err != nil {
+ if err := ntab.SetFallbackNodes(srv.BootstrapNodesV5); err != nil {
return err
}
srv.DiscV5 = ntab