-
Notifications
You must be signed in to change notification settings - Fork 38.6k
seeds: add signet/testnet4, update makeseeds regex, minblocks, fixed seeds #31960
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code Coverage & BenchmarksFor details see: https://corecheck.dev/bitcoin/bitcoin/pulls/31960. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
This comment was marked as abuse.
This comment was marked as abuse.
8c054bd to
b2dc445
Compare
|
Updated to take @laanwj's review feedback and re-ran the seeds scripts. |
|
Code review ACK b2dc4458ac86c0a633ca3eb87827ac2731993f97 on the script changes mainnet testnet i have re-run the steps in an attempt to check the output, but the lack of determinism makes it hard to say anything. All that could be concluded is that the diff is smaller from the previous state to the current one, to the one between the current one and my re-run: $ git show HEAD --shortstat nodes_main.txt
commit b2dc4458ac86c0a633ca3eb87827ac2731993f97 (HEAD)
1 file changed, 1618 insertions(+), 1627 deletions(-)
$ git diff --shortstat nodes_main.txt
1 file changed, 419 insertions(+), 418 deletions(-)
$ git show HEAD --shortstat nodes_test.txt
commit b2dc4458ac86c0a633ca3eb87827ac2731993f97 (HEAD)
1 file changed, 128 insertions(+), 222 deletions(-)
$ git diff --shortstat nodes_test.txt
(no output)The testnet output does match 100%. |
|
Yes, for the avoidance of doubt, I ran the script with no manual curation (as done previously from v21 to v27). |
|
Could also do testnet4, my seeder publishes a seeds.txt.gz at https://testnet4.achownodes.xyz/seeds.txt.gz. And also signet: https://signet.achownodes.xyz/seeds.txt.gz |
b2dc445 to
959d662
Compare
Done. Also updated |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have only reviewed the regexes, please see my suggestions.
Regexes
PATTERN_IPV4 = re.compile(r"^(([0-2]?\d{1,2})\.([0-2]?\d{1,2})\.([0-2]?\d{1,2})\.([0-2]?\d{1,2})):(\d{1,5})$")
PATTERN_IPV6 = re.compile(r"^\[([\da-f:]+)]:(\d{1,5})$", re.IGNORECASE)
PATTERN_ONION = re.compile(r"^([a-z2-7]{56}\.onion):(\d{1,5})$")
PATTERN_I2P = re.compile(r"^([a-z2-7]{52}\.b32\.i2p):(\d{1,5})$")
PATTERN_AGENT = re.compile(
r"^/Satoshi:("
r"0\.14\.([0-3]|99)"
r"|0\.15\.([0-2]|99)"
r"|0\.16\.([0-3]|99)"
r"|0\.17\.(0\.1|[0-2]|99)"
r"|0\.18\.([01]|99)"
r"|0\.19\.([0-2]|99)"
r"|0\.20\.([0-2]|99)"
r"|0\.21\.([0-2]|99)"
r"|22\.([01]|99)\.0"
r"|23\.([01]|99)\.0"
r"|24\.([0-2]|99)\.[01]"
r"|25\.([0-2]|99)\.0"
r"|26\.([01]|99)\.0"
r"|27\.([01]|99)\.0"
r"|28\.(0|99)\.0"
r")")|
While src/chainparamsseeds.h now has |
e482f33 to
ff2a5ae
Compare
|
Thanks for the reviews @l0rinc and @achow101. Updated to take @achow101's suggestion, added a commit by @l0rinc with his review feedback (makeseeds output appears unchanged by the robustness/consistency changes to the regexes), updated |
ff2a5ae to
9ef218c
Compare
|
Re-pushed to add a missing escape to the regexes commit that I had overlooked. |
We shouldn't have | at the end of the last clause, as this will make it match the empty string too (so effectively everything starting with Satoshi: matches). While doing this, put the | at the beginning of every line of regex rather than the end, to make it easier to update in the future without accidentally running into this problem again.
|
Needs rebase |
9ef218c to
89fd9a4
Compare
|
Rebased |
|
ACK 89fd9a4a87d772798671da18538e45f0272365e4 |
89fd9a4 to
f0b6597
Compare
In
makeseeds.py:MIN_BLOCKS(4320 blocks/month * ~6.5 months) and add README documentation to remember to update itAdd signet and testnet4 seeds to the README and to
generate-seeds.pyUpdate the fixed seeds in
src/chainparamsseeds.hIn
kernel/chainparams.cpp:Update
contrib/seeds/.gitignorewith signet and testnet4The previous 2 seeds updates were #30008 and #30695.
mainnet:
signet:
testnet:
testnet4