RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove exception for onion peers

Browse Source 
Like clearnet peers, they are only returned in server.peers.subscribe
if there was a successful connection.
This commit is contained in:
Neil Booth 2017-09-08 17:29:09 +09:00
parent 9dd5541f82
commit 40fa79da63
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/PEER_DISCOVERY.rst
View File

@ -53,13 +53,8 @@ The server should craft its response in a way that reduces the
effectiveness of sybil attacks and peer spamming. effectiveness of sybil attacks and peer spamming.
The response should only include peers it has successfully connected The response should only include peers it has successfully connected
to recently. If Tor routing is not available, so their existence to recently. Only reporting recent good peers ensures that those that
cannot be verified, the response should include some hard-coded onion have gone offline will not be passed around for long.
peers so that clients always have a choice of onion servers.
Only reporting recent good peers ensures that those that have gone
offline will not be passed around for long (ignoring for hard-coded
onion peer exception).
In ElectrumX, "recently" is taken to be the last 24 hours. Only one In ElectrumX, "recently" is taken to be the last 24 hours. Only one
peer from each IPv4/16 netmask is returned, and the number of onion peer from each IPv4/16 netmask is returned, and the number of onion

4
server/peers.py
View File

@ -259,7 +259,6 @@ class PeerManager(util.LoggedClass):
# IP address that was connected to. Adding a peer will evict # IP address that was connected to. Adding a peer will evict
# any other peers with the same host name or IP address. # any other peers with the same host name or IP address.
self.peers = set() self.peers = set()
self.onion_peers = []
self.permit_onion_peer_time = time.time() self.permit_onion_peer_time = time.time()
self.proxy = SocksProxy(env.tor_proxy_host, env.tor_proxy_port, self.proxy = SocksProxy(env.tor_proxy_host, env.tor_proxy_port,
loop=self.loop) loop=self.loop)
@ -417,7 +416,6 @@ class PeerManager(util.LoggedClass):
peers.update(bucket_peers[:2]) peers.update(bucket_peers[:2])
# Add up to 20% onion peers (but up to 10 is OK anyway) # Add up to 20% onion peers (but up to 10 is OK anyway)
onion_peers = onion_peers or self.onion_peers
random.shuffle(onion_peers) random.shuffle(onion_peers)
max_onion = 50 if is_tor else max(10, len(peers) // 4) max_onion = 50 if is_tor else max(10, len(peers) // 4)
@ -460,8 +458,6 @@ class PeerManager(util.LoggedClass):
'''Import hard-coded peers from a file or the coin defaults.''' '''Import hard-coded peers from a file or the coin defaults.'''
self.add_peers(self.myselves) self.add_peers(self.myselves)
coin_peers = self.env.coin.PEERS coin_peers = self.env.coin.PEERS
self.onion_peers = [Peer.from_real_name(rn, 'coins.py')
for rn in coin_peers if '.onion ' in rn]
# If we don't have many peers in the peers file, add # If we don't have many peers in the peers file, add
# hard-coded ones # hard-coded ones