From 7cd81a69f71103c409288bb1ac72aaec71b647b6 Mon Sep 17 00:00:00 2001 From: Dmitry Shulyak Date: Fri, 24 Aug 2018 14:20:50 +0300 Subject: [PATCH] Add rendezvous nodes and search for 2 les peers if les is enabled (#1167) --- params/cluster.go | 8 ++++++++ params/config.go | 3 +++ params/defaults.go | 2 ++ 3 files changed, 13 insertions(+) diff --git a/params/cluster.go b/params/cluster.go index 0b3cba8e5..22809c584 100644 --- a/params/cluster.go +++ b/params/cluster.go @@ -93,6 +93,10 @@ var stagingCluster = []Cluster{ "enode://10a78c17929a7019ef4aa2249d7302f76ae8a06f40b2dc88b7b31ebff4a623fbb44b4a627acba296c1ced3775d91fbe18463c15097a6a36fdb2c804ff3fc5b35@35.238.97.234:30404", // boot-01.gc-us-central1-a.eth.staging "enode://f79fb3919f72ca560ad0434dcc387abfe41e0666201ebdada8ede0462454a13deb05cda15f287d2c4bd85da81f0eb25d0a486bbbc8df427b971ac51533bd00fe@174.138.107.239:30404", // boot-01.do-ams3.eth.staging }, + RendezvousNodes: []string{ + "/ip4/174.138.107.239/tcp/30703/ethv4/16Uiu2HAkyJHeetQ4DNpd4NZ2ntzxMo25zcdpvGQRqkD5pB9BE6RU", + "/ip4/35.238.97.234/tcp/30703/ethv4/16Uiu2HAm1sVyXmkMNjdeDWqK2urbyC3oBHi8MDpCdYkns1nYafqz", + }, }, { NetworkID: RopstenNetworkID, @@ -100,6 +104,10 @@ var stagingCluster = []Cluster{ "enode://10a78c17929a7019ef4aa2249d7302f76ae8a06f40b2dc88b7b31ebff4a623fbb44b4a627acba296c1ced3775d91fbe18463c15097a6a36fdb2c804ff3fc5b35@35.238.97.234:30404", // boot-01.gc-us-central1-a.eth.staging "enode://f79fb3919f72ca560ad0434dcc387abfe41e0666201ebdada8ede0462454a13deb05cda15f287d2c4bd85da81f0eb25d0a486bbbc8df427b971ac51533bd00fe@174.138.107.239:30404", // boot-01.do-ams3.eth.staging }, + RendezvousNodes: []string{ + "/ip4/174.138.107.239/tcp/30703/ethv4/16Uiu2HAkyJHeetQ4DNpd4NZ2ntzxMo25zcdpvGQRqkD5pB9BE6RU", + "/ip4/35.238.97.234/tcp/30703/ethv4/16Uiu2HAm1sVyXmkMNjdeDWqK2urbyC3oBHi8MDpCdYkns1nYafqz", + }, }, } diff --git a/params/config.go b/params/config.go index 6e268c0b9..db686b829 100644 --- a/params/config.go +++ b/params/config.go @@ -696,6 +696,9 @@ func (c *NodeConfig) updatePeerLimits() { c.RequireTopics[WhisperDiscv5Topic] = WhisperDiscv5Limits // TODO(dshulyak) register mailserver limits when we will change how they are handled. } + if c.LightEthConfig.Enabled { + c.RequireTopics[discv5.Topic(LesTopic(int(c.NetworkID)))] = LesDiscoveryLimits + } } // String dumps config object as nicely indented JSON diff --git a/params/defaults.go b/params/defaults.go index 0071a0570..6487bef6e 100644 --- a/params/defaults.go +++ b/params/defaults.go @@ -119,4 +119,6 @@ const ( var ( // WhisperDiscv5Limits declares min and max limits for peers with whisper topic. WhisperDiscv5Limits = Limits{2, 2} + // LesDiscoveryLimits default limits used if LES and discovery are enabled. + LesDiscoveryLimits = Limits{2, 2} )