Skip to content

Commit 1420547

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#25911: net: update hardcoded mainnet seeds for 24.x
9b6f5fa net: update hardcoded mainnet seeds for 24.x (Jon Atack) 7fd9028 contrib: make-seeds updates for 24.x (Jon Atack) 6075a0b net: update manual hardcoded mainnet seeds for 24.x (Jon Atack) Pull request description: Update the hardcoded P2P network seeds for 24.x after updating the manual seeds and the generation script as necessary. Previous update was #24417. Can be tested by following the steps in `contrib/seeds/README.md`. Tool output: ``` $ python3 makeseeds.py -a asmap-filled.dat < seeds_main.txt > nodes_main.txt Loading asmap database "asmap-filled.dat"…Done. Loading and parsing DNS seeds…Done. IPv4 IPv6 Onion Pass 472019 73788 0 Initial 472019 73788 0 Skip entries with invalid address 472019 73788 0 After removing duplicates 7766 2310 0 Enforce minimal number of blocks 6534 1835 0 Require service bit 1 2808 801 0 Require minimum uptime 2748 781 0 Require a known and recent user agent 2727 775 0 Filter out hosts with multiple bitcoin ports 512 267 0 Look up ASNs and limit results per ASN and per net ``` ACKs for top commit: laanwj: LGTM ACK 9b6f5fa Emzy: ACK 9b6f5fa brunoerg: ACK 9b6f5fa Tree-SHA512: eef994bbd60524cfd9e4b5b836ddbe615cd2a77466394cdbb70a0ebc30c7822d8605473424f6d4a1ba37313c59373cf10717977a5c07e6f839e5ff86464c8c55
2 parents 2d83a20 + 9b6f5fa commit 1420547

File tree

4 files changed

+1518
-1146
lines changed

4 files changed

+1518
-1146
lines changed

contrib/seeds/makeseeds.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2013-2020 The Bitcoin Core developers
2+
# Copyright (c) 2013-2022 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
#
66
# Generate seeds.txt from Pieter's DNS seeder
77
#
88

99
import argparse
10+
import collections
1011
import ipaddress
1112
import re
1213
import sys
13-
import collections
1414
from typing import List, Dict, Union
1515

1616
from asmap import ASMap, net_to_prefix
@@ -38,7 +38,8 @@
3838
r"0.20.(0|1|2|99)|"
3939
r"0.21.(0|1|2|99)|"
4040
r"22.(0|99)|"
41-
r"23.99"
41+
r"23.(0|99)|"
42+
r"24.99"
4243
r")")
4344

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

0 commit comments

Comments
 (0)