In preparation for dropping testnet3 entirely in #31974 this PR migrates a few things to testnet4:
feature_assumeutxo.pyIt drops testnet3 from MAGIC_BYTES in the test framework, since no test uses it.
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32096.
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | fjahr, maflcko, hodlinator |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
Reviewers, 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.
I’m unsure if I got the argsman_tests changes right.
An alternative approach could be to move (some of) these tests to signet, which is less likely to go away than testnet4.
11- -zmqpubrawtx=tcp://127.0.0.1:28332 \
12- -zmqpubrawblock=tcp://127.0.0.1:28332 \
13- -zmqpubhashtx=tcp://127.0.0.1:28332 \
14- -zmqpubhashblock=tcp://127.0.0.1:28332 \
15- -zmqpubsequence=tcp://127.0.0.1:28332
16+ bitcoind -testnet4 -daemon \
I found myself wondering what ports to use on mainnet, so I’ll probably just leave it as testnet4.
Someone should come up with a recommended set of ZMQ port numbers though, but not here.
utACK 2906b183169bc78b37449a818717249c2d1cb7a1
Reviewed the code and changes look good to me.
668 BOOST_CHECK_EQUAL(test_args.GetChainTypeString(), "main");
669
670- BOOST_CHECK(test_args.ParseParameters(2, argv_testnet, error));
671- BOOST_CHECK_EQUAL(test_args.GetChainTypeString(), "test");
672+ BOOST_CHECK(test_args.ParseParameters(2, argv_testnet4, error));
673+ BOOST_CHECK_EQUAL(test_args.GetChainTypeString(), "testnet4");
409@@ -410,7 +410,7 @@ to see it.
410 ### Signet, testnet, and regtest modes
411
412 If you are testing multi-machine code that needs to operate across the internet,
413-you can run with either the `-signet` or the `-testnet` config option to test
414+you can run with either the `-signet` or the `-testnet4` config option to test
415 with "play bitcoins" on a test network.
416
(Inline thread in random position)
informational: https://developer.bitcoin.org/examples/intro.html / https://github.com/bitcoin-dot-org/developer.bitcoin.org/blob/master/examples/intro.rst still references the Testnet3 RPC port 18332. But the repo hasn’t been updated for 4 years.
bitcoin.org project is independent from Bitcoin Core, but you could open a PR there to recommend that they recommend testnet4.
ACK 2906b183169bc78b37449a818717249c2d1cb7a1
Ran functional tests with --extended with on a non-multiprocess devmode build (in part to verify network MAGIC_BYTES change).
feature_assumeutxo.py (new commit), removed the duplication in argsman_tests.cpp.
Not sure what to make of the Win64 fuzz failure:
0Assertion failed: DecodeBase64PSBT(psbt, random_string, error) == error.empty(), file
https://github.com/bitcoin/bitcoin/actions/runs/14055561051/job/39354164966?pr=32096#step:14:373
cc @maflcko
Update, appears unrelated, see #32135.
Not sure what to make of the Win64 fuzz failure:
re-ACK 2ee474d33f3340084a458e7348f5358fcaea8911
16+ bitcoind -testnet4 -daemon \
17+ -zmqpubrawtx=tcp://127.0.0.1:48332 \
18+ -zmqpubrawblock=tcp://127.0.0.1:48332 \
19+ -zmqpubhashtx=tcp://127.0.0.1:48332 \
20+ -zmqpubhashblock=tcp://127.0.0.1:48332 \
21+ -zmqpubsequence=tcp://127.0.0.1:48332
e1862a0b5d3ff46d507ff8cd3426292ff587328d: Why are you changing this? Have you tested this?
My understanding is that this is already the rpc port, so re-using it should fail.
-testnet to -testnet4.
80@@ -81,8 +81,8 @@ The high water mark value must be an integer greater than or equal to 0.
81
82 For instance:
83
84- $ bitcoind -zmqpubhashtx=tcp://127.0.0.1:28332 \
85- -zmqpubhashtx=tcp://192.168.1.2:28332 \
86+ $ bitcoind -zmqpubhashtx=tcp://127.0.0.1:48332 \
87+ -zmqpubhashtx=tcp://192.168.1.2:48332 \
Replace testnet3 and use MAGIC_BYTES constants.
re-ACK aa7a898c236eb519aaf546afee2b9c2b6dfdea1f
Just removed the change of zmq ports.
lgtm ACK aa7a898c236eb519aaf546afee2b9c2b6dfdea1f 🔊
Signature:
0untrusted comment: signature from minisign secret key on empty file; verify via: minisign -Vm "${path_to_any_empty_file}" -P RWTRmVTMeKV5noAMqVlsMugDDCyyTSbA3Re5AkUrhvLVln0tSaFWglOw -x "${path_to_this_whole_four_line_signature_blob}"
1RUTRmVTMeKV5npGrKx1nqXCw5zeVHdtdYURB/KlyA/LMFgpNCs+SkW9a8N95d+U4AP1RJMi+krxU1A3Yux4bpwZNLvVBKy0wLgM=
2trusted comment: lgtm ACK aa7a898c236eb519aaf546afee2b9c2b6dfdea1f 🔊
3LZn2toUp80K0lEVpMDDXYzRUmbBeK6deAYV8ud1Go6oIr7dmDGyx2EK5QuBm0m4vVmxjMrUHDo+OnctMeTx2Aw==