diff options
author | fanquake <fanquake@gmail.com> | 2022-04-18 11:28:02 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2022-04-18 11:29:01 +0100 |
commit | d2e04196b676d544157a53b98d37d8d12a59a961 (patch) | |
tree | a9a642f0a9741c1790a78866630ea73b5e89a7f3 | |
parent | 2074d7df20ebc100db6a7b2c3b784ef0bdb8753f (diff) | |
parent | 2f629f80896697e458b47a8335744a11b4f33587 (diff) | |
download | bitcoin-d2e04196b676d544157a53b98d37d8d12a59a961.tar.xz |
Merge bitcoin/bitcoin#24862: contrib: Remove suspicious hosts list from makeseeds
2f629f80896697e458b47a8335744a11b4f33587 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: https://github.com/bitcoin/bitcoin/issues/17020#issuecomment-1099973383
\* 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 https://github.com/bitcoin/bitcoin/pull/24862/commits/2f629f80896697e458b47a8335744a11b4f33587
jonatack:
ACK 2f629f80896697e458b47a8335744a11b4f3358
1440000bytes:
ACK https://github.com/bitcoin/bitcoin/pull/24862/commits/2f629f80896697e458b47a8335744a11b4f33587
Tree-SHA512: 3159d7df7cf66415a5db6058b62e5696efcf6c46b0ec38090e22ba26d9b375eb1a88f510b71769eb7b4f14e7007d2b64e1709cf6b1300ade3f7277d50efb3ddb
-rwxr-xr-x | contrib/seeds/makeseeds.py | 9 | ||||
-rw-r--r-- | contrib/seeds/suspicious_hosts.txt | 16 |
2 files changed, 0 insertions, 25 deletions
diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index 4382b7d258..78eb04a836 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -21,12 +21,6 @@ MAX_SEEDS_PER_ASN = { MIN_BLOCKS = 730000 -# These are hosts that have been observed to be behaving strangely (e.g. -# aggressively connecting to every node). -with open("suspicious_hosts.txt", mode="r", encoding="utf-8") as f: - SUSPICIOUS_HOSTS = {s.strip() for s in f if s.strip()} - - PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$") PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$") PATTERN_ONION = re.compile(r"^([a-z2-7]{56}\.onion):(\d+)$") @@ -213,9 +207,6 @@ def main(): # Skip duplicates (in case multiple seeds files were concatenated) ips = dedup(ips) print(f'{ip_stats(ips):s} After removing duplicates', file=sys.stderr) - # Skip entries from suspicious hosts. - ips = [ip for ip in ips if ip['ip'] not in SUSPICIOUS_HOSTS] - print(f'{ip_stats(ips):s} Skip entries from suspicious hosts', file=sys.stderr) # Enforce minimal number of blocks. ips = [ip for ip in ips if ip['blocks'] >= MIN_BLOCKS] print(f'{ip_stats(ips):s} Enforce minimal number of blocks', file=sys.stderr) diff --git a/contrib/seeds/suspicious_hosts.txt b/contrib/seeds/suspicious_hosts.txt deleted file mode 100644 index 13385cc816..0000000000 --- a/contrib/seeds/suspicious_hosts.txt +++ /dev/null @@ -1,16 +0,0 @@ -130.211.129.106 -148.251.238.178 -176.9.46.6 -178.63.107.226 -54.173.72.127 -54.174.10.182 -54.183.64.54 -54.194.231.211 -54.66.214.167 -54.66.220.137 -54.67.33.14 -54.77.251.214 -54.94.195.96 -54.94.200.247 -83.81.130.26 -88.198.17.7
\ No newline at end of file |