Skip to content

Commit 8a9ffec

Browse files
committed
Merge #13951: Hardcoded seeds update pre-0.17 branch
176aa5a contrib: fix GetDesirableServiceFlags typo in seeds/README.md (MarcoFalke) 825fb02 net: Update hardcoded seeds (Wladimir J. van der Laan) 61c0d3b contrib: in makeseeds, add 0.16.x to PATTERN_AGENT, remove 0.13.x (Wladimir J. van der Laan) Pull request description: As per release process and https://github.com/bitcoin/bitcoin/blob/master/contrib/seeds/README.md Tree-SHA512: c1acd43d8462196f2606babd5268ea75dbb844da729ac9592f08b4895c6a4754591ccbc6ac0bc364b2fb082695e72656154c141dd83c847db8973b3af8df74be
2 parents 4da19de + 176aa5a commit 8a9ffec

File tree

4 files changed

+1938
-2452
lines changed

4 files changed

+1938
-2452
lines changed

contrib/seeds/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Utility to generate the seeds.txt list that is compiled into the client
44
(see [src/chainparamsseeds.h](/src/chainparamsseeds.h) and other utilities in [contrib/seeds](/contrib/seeds)).
55

66
Be sure to update `PATTERN_AGENT` in `makeseeds.py` to include the current version,
7-
and remove old versions as necessary (at a minimum when GetDesireableServiceFlags
7+
and remove old versions as necessary (at a minimum when GetDesirableServiceFlags
88
changes its default return value, as those are the services which seeds are added
99
to addrman with).
1010

contrib/seeds/makeseeds.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$")
3131
PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$")
3232
PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$")
33-
PATTERN_AGENT = re.compile(r"^(/Satoshi:0.13.(1|2|99)/|/Satoshi:0.14.(0|1|2|99)/|/Satoshi:0.15.(0|1|2|99)/)$")
33+
PATTERN_AGENT = re.compile(r"^(/Satoshi:0.14.(0|1|2|99)/|/Satoshi:0.15.(0|1|2|99)|/Satoshi:0.16.(0|1|2|99)/)$")
3434

3535
def parseline(line):
3636
sline = line.split()

0 commit comments

Comments
 (0)