Skip to content

Commit 6db0a30

Browse files
committed
Merge bitcoin/bitcoin#27488: p2p: update hardcoded mainnet seeds for 25.x
31b1798 p2p: update hardcoded mainnet seeds for 25.x (Jon Atack) 04dd1d3 contrib: make-seeds updates for 25.x (Jon Atack) f5c8788 p2p: update manual tor/i2p/cjdns mainnet seeds for 25.x (Jon Atack) Pull request description: Update the hardcoded P2P network seeds for 25.x after updating the manual seeds and the generation script as necessary. Previous update was #25911. The manual seeds are selected for reachability, uptime and service bit 1 and/or curated trusted peers. We need more Tor and CJDNS seeds and some of the current Tor and I2P seeds are no longer reachable. Can be tested by following the steps in `contrib/seeds/README.md` and verifying the manual seeds by checking their presence and services in getnodeaddresses and/or connecting to them and checking their services with getpeerinfo and behavior with -netinfo. Tool output: ``` $ python3 makeseeds.py -a asmap-filled.dat -s seeds_main.txt > nodes_main.txt Loading asmap database "asmap-filled.dat"…Done. Loading and parsing DNS seeds…Done. IPv4 IPv6 Onion Pass 3972 1118 0 Initial 3972 1118 0 Skip entries with invalid address 3972 1118 0 After removing duplicates 3946 1112 0 Enforce minimal number of blocks 3946 1112 0 Require service bit 1 2791 798 0 Require minimum uptime 2757 788 0 Require a known and recent user agent 2757 788 0 Filter out hosts with multiple bitcoin ports 512 289 0 Look up ASNs and limit results per ASN and per net``` ACKs for top commit: achow101: ACK 31b1798 mzumsande: reACK 31b1798 Tree-SHA512: 40cdd0ac74e3d26975ab688ee4af09bedcf15f6e02311757b27c91aafdc4da16cca2be90fee767207bb4ccd542ad19197e4d5e00011185018239de35da19c174
2 parents 3133d93 + 31b1798 commit 6db0a30

File tree

5 files changed

+1247
-1150
lines changed

5 files changed

+1247
-1150
lines changed

contrib/seeds/README.md

+7-5
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ to addrman with).
1111
The seeds compiled into the release are created from sipa's DNS seed and AS map
1212
data. Run the following commands from the `/contrib/seeds` directory:
1313

14-
curl https://bitcoin.sipa.be/seeds.txt.gz | gzip -dc > seeds_main.txt
15-
curl https://bitcoin.sipa.be/asmap-filled.dat > asmap-filled.dat
16-
python3 makeseeds.py -a asmap-filled.dat -s seeds_main.txt > nodes_main.txt
17-
cat nodes_main_manual.txt >> nodes_main.txt
18-
python3 generate-seeds.py . > ../../src/chainparamsseeds.h
14+
```
15+
curl https://bitcoin.sipa.be/seeds.txt.gz | gzip -dc > seeds_main.txt
16+
curl https://bitcoin.sipa.be/asmap-filled.dat > asmap-filled.dat
17+
python3 makeseeds.py -a asmap-filled.dat -s seeds_main.txt > nodes_main.txt
18+
cat nodes_main_manual.txt >> nodes_main.txt
19+
python3 generate-seeds.py . > ../../src/chainparamsseeds.h
20+
```

contrib/seeds/makeseeds.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@
3737
r"0.19.(0|1|2|99)|"
3838
r"0.20.(0|1|2|99)|"
3939
r"0.21.(0|1|2|99)|"
40-
r"22.(0|99)|"
41-
r"23.(0|99)|"
42-
r"24.99"
40+
r"22.(0|1|99)|"
41+
r"23.(0|1|99)|"
42+
r"24.(0|1|99)|"
43+
r"25.99"
4344
r")")
4445

4546
def parseline(line: str) -> Union[dict, None]:

0 commit comments

Comments
 (0)