Skip to content

Commit d2e0419

Browse files
committed
Merge bitcoin/bitcoin#24862: contrib: Remove suspicious hosts list from makeseeds
2f629f8 contrib: Remove suspicious hosts list from makeseeds (laanwj) Pull request description: I have some qualms about maintaining a suspicious hosts list as part as the repository\*. But also, it's stale and irrelevant. I've checked the entire list and none of them is connectable. Only one still appars in `nodes_main.txt` but with low uptime and an old subversion string so it wouldn't be picked in the first place. This change removes the list and the functionality to use it. | IP | 8333 connectable | in `nodes_main.txt` | |------------------|---------------------|-----------------------| | 130.211.129.106 | no | no | | 148.251.238.178 | no | no | | 176.9.46.6 | no | yes: /Satoshi:0.9.2.1/ | | 178.63.107.226 | no | no | | 54.173.72.127 | no | no | | 54.174.10.182 | no | no | | 54.183.64.54 | no | no | | 54.194.231.211 | no | no | | 54.66.214.167 | no | no | | 54.66.220.137 | no | no | | 54.67.33.14 | no | no | | 54.77.251.214 | no | no | | 54.94.195.96 | no | no | | 54.94.200.247 | no | no | | 83.81.130.26 | no | no | | 88.198.17.7 | no | no | ref: bitcoin/bitcoin#17020 (comment) \* besides the commit noise, potential legal issues around accountability and liability that would come with maintaining such a blocklist actively, I don't think we should expose the project to ACKs for top commit: Empact: ACK bitcoin/bitcoin@2f629f8 jonatack: ACK 2f629f8 1440000bytes: ACK bitcoin/bitcoin@2f629f8 Tree-SHA512: 3159d7df7cf66415a5db6058b62e5696efcf6c46b0ec38090e22ba26d9b375eb1a88f510b71769eb7b4f14e7007d2b64e1709cf6b1300ade3f7277d50efb3ddb
2 parents 2074d7d + 2f629f8 commit d2e0419

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

contrib/seeds/makeseeds.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121

2222
MIN_BLOCKS = 730000
2323

24-
# These are hosts that have been observed to be behaving strangely (e.g.
25-
# aggressively connecting to every node).
26-
with open("suspicious_hosts.txt", mode="r", encoding="utf-8") as f:
27-
SUSPICIOUS_HOSTS = {s.strip() for s in f if s.strip()}
28-
29-
3024
PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$")
3125
PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$")
3226
PATTERN_ONION = re.compile(r"^([a-z2-7]{56}\.onion):(\d+)$")
@@ -213,9 +207,6 @@ def main():
213207
# Skip duplicates (in case multiple seeds files were concatenated)
214208
ips = dedup(ips)
215209
print(f'{ip_stats(ips):s} After removing duplicates', file=sys.stderr)
216-
# Skip entries from suspicious hosts.
217-
ips = [ip for ip in ips if ip['ip'] not in SUSPICIOUS_HOSTS]
218-
print(f'{ip_stats(ips):s} Skip entries from suspicious hosts', file=sys.stderr)
219210
# Enforce minimal number of blocks.
220211
ips = [ip for ip in ips if ip['blocks'] >= MIN_BLOCKS]
221212
print(f'{ip_stats(ips):s} Enforce minimal number of blocks', file=sys.stderr)

contrib/seeds/suspicious_hosts.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)