This completes follow-ups left open in #29775.
MAX_TIMEWARP constant as the timewarp defense delta, equal to MAX_FUTURE_BLOCK_TIME.
This chainwork was observed at height 38487.
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For detailed information about the code coverage, see the test coverage report.
See 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.
16@@ -17,7 +17,7 @@ void SetupChainParamsBaseOptions(ArgsManager& argsman)
17 argsman.AddArg("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. "
18 "This is intended for regression testing tools and app development. Equivalent to -chain=regtest.", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
19 argsman.AddArg("-testactivationheight=name@height.", "Set the activation height of 'name' (segwit, bip34, dersig, cltv, csv). (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
20- argsman.AddArg("-testnet", "Use the testnet3 chain. Equivalent to -chain=test. Support for testnet3 is deprecated and will be removed with the next release. Consider moving to testnet4 now by using -testnet4.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
21+ argsman.AddArg("-testnet", "Use the testnet3 chain. Equivalent to -chain=test. Support for testnet3 is deprecated and will be removed in an upcoming release (current target v30). Consider moving to testnet4 now by using -testnet4.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
916@@ -917,7 +917,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
917
918 // Testnet3 deprecation warning
919 if (chain == ChainType::TESTNET) {
920- LogInfo("Warning: Support for testnet3 is deprecated and will be removed in an upcoming release. Consider switching to testnet4.\n");
921+ LogInfo("Warning: Support for testnet3 is deprecated and will be removed in an upcoming release (current target v30). Consider switching to testnet4.\n");
Looks like feature_config_args.py needs to be updated to reflect the updated log. Something like:
0diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py
1index bb20e2baa85..201112ba0d5 100755
2--- a/test/functional/feature_config_args.py
3+++ b/test/functional/feature_config_args.py
4@@ -378,7 +378,7 @@ class ConfArgsTest(BitcoinTestFramework):
5
6 def test_testnet3_deprecation_msg(self):
7 self.log.info("Test testnet3 deprecation warning")
8- t3_warning_log = "Warning: Support for testnet3 is deprecated and will be removed in an upcoming release. Consider switching to testnet4."
9+ t3_warning_log = "Warning: Support for testnet3 is deprecated and will be removed in an upcoming release (current target v30). Consider switching to testnet4."
10
11 def warning_msg(node, approx_size):
12 return f'Warning: Disk space for "{node.datadir_path / node.chain / "blocks" }" may not accommodate the block files. Approximately {approx_size} GB of data will be stored in this directory.'
MAX_FUTURE_BLOCK_TIME explicitly as the timewarp defense delta.
4187@@ -4188,7 +4188,7 @@ static bool ContextualCheckBlockHeader(const CBlockHeader& block, BlockValidatio
4188 // Check timestamp for the first block of each difficulty adjustment
4189 // interval, except the genesis block.
4190 if (nHeight % consensusParams.DifficultyAdjustmentInterval() == 0) {
4191- if (block.GetBlockTime() < pindexPrev->GetBlockTime() - 60 * 60 * 2) {
4192+ if (block.GetBlockTime() < pindexPrev->GetBlockTime() - MAX_FUTURE_BLOCK_TIME) {
35ad61a6bde14a74cc07dc8ecf3bb1cd49590e46: let’s define a separate constant and make it clear these are different but related:
0/**
1 * Maximum number of seconds that the timestamp of the first
2 * block of a difficulty adjustment period is allowed to
3 * be earlier than the last block of the previous period (BIP94).
4 */
5static constexpr int64_t MAX_TIMEWARP{MAX_FUTURE_BLOCK_TIME};
6
7/**
8 * If the timestamp of the last block in a difficulty period is set
9 * MAX_FUTURE_BLOCK_TIME seconds in the future, an honest miner should
10 * be able to mine the first block using the current time. This is not
11 * a consensus rule, but changing MAX_TIMEWARP should be done with caution.
12 */
13static_assert(MAX_FUTURE_BLOCK_TIME <= MAX_TIMEWARP);
(I’m less sure about having the static_assert and its documentation in our codebase)
See ongoing discussion in https://github.com/bitcoin/bips/pull/1658
let’s define a separate constant
done
And see #30614, but that should probably be its own followup.
Agree, it seems that we currently have the safer option given we don’t really know what other mining software is doing (at least that’s my feeling). If we do still get consensus on tightening the limit we can do that in another follow-up in the next two weeks but it shouldn’t hold up this PR here.
333@@ -334,7 +334,7 @@ class CTestNet4Params : public CChainParams {
334 consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
335 consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay
336
337- consensus.nMinimumChainWork = uint256{};
338+ consensus.nMinimumChainWork = uint256{"000000000000000000000000000000000000000000000056faca98a0cd9bdf5f"};
The value is equal to MAX_FUTURE_BLOCK_TIME.
