feat: enforce DIP0001 from first block on regtest and drop fDIP0001ActiveAtTip

The flag fDIP0001ActiveAtTip shows a status of activation of DIP0001

This flag is used currently only in net.cpp for setup block buffer size.
Assume the bigger by default so far as DIP0001 is activated years ago

Author: knst

src/chainparams.cpp

@@ -800,7 +800,7 @@ class CRegTestParams : public CChainParams {
         consensus.BIP66Height = 1;   // Always active unless overridden
         consensus.BIP147Height = 1;  // Always active unless overridden
         consensus.CSVHeight = 1;     // Always active unless overridden
-        consensus.DIP0001Height = 2000;
+        consensus.DIP0001Height = 1; // Always active unless overridden
         consensus.DIP0003Height = 432;
         consensus.DIP0003EnforcementHeight = 500;
         consensus.DIP0003EnforcementHash = uint256();
@@ -1056,6 +1056,8 @@ static void MaybeUpdateHeights(const ArgsManager& args, Consensus::Params& conse
             consensus.CSVHeight = int{height};
         } else if (name == "brr") {
             consensus.BRRHeight = int{height};
+        } else if (name == "dip0001") {
+            consensus.DIP0001Height = int{height};
         } else if (name == "dip0008") {
             consensus.DIP0008Height = int{height};
         } else if (name == "dip0020") {

src/chainparamsbase.cpp

@@ -22,7 +22,7 @@ void SetupChainParamsBaseOptions(ArgsManager& argsman)
     argsman.AddArg("-dip3params=<activation>:<enforcement>", "Override DIP3 activation and enforcement heights (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-dip8params=<activation>", "Override DIP8 activation height (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-bip147height=<activation>", "Override BIP147 activation height (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
-    argsman.AddArg("-testactivationheight=name@height.", "Set the activation height of 'name' (bip147, bip34, dersig, cltv, csv, brr, dip0008, dip0020). (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
+    argsman.AddArg("-testactivationheight=name@height.", "Set the activation height of 'name' (bip147, bip34, dersig, cltv, csv, brr, dip0001, dip0008, dip0020). (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-highsubsidyblocks=<n>", "The number of blocks with a higher than normal subsidy to mine at the start of a chain. Block after that height will have fixed subsidy base. (default: 0, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-highsubsidyfactor=<n>", "The factor to multiply the normal block subsidy by while in the highsubsidyblocks window of a chain (default: 1, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-llmqchainlocks=<quorum name>", "Override the default LLMQ type used for ChainLocks. Allows using ChainLocks with smaller LLMQs. (default: llmq_devnet, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);

src/dsnotificationinterface.cpp

@@ -81,9 +81,6 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
 
     m_mn_sync.UpdatedBlockTip(WITH_LOCK(::cs_main, return m_chainman.m_best_header), pindexNew, fInitialDownload);
 
-    // Update global DIP0001 activation status
-    fDIP0001ActiveAtTip = pindexNew->nHeight >= Params().GetConsensus().DIP0001Height;
-
     if (fInitialDownload)
         return;
 

src/net.cpp

@@ -33,7 +33,6 @@
 #include <util/time.h>
 #include <util/translation.h>
 #include <util/wpipe.h>
-#include <validation.h> // for fDIP0001ActiveAtTip
 
 #include <masternode/meta.h>
 #include <masternode/sync.h>
@@ -4079,7 +4078,7 @@ bool CConnman::OutboundTargetReached(bool historicalBlockServingLimit) const
     {
         // keep a large enough buffer to at least relay each block once
         const std::chrono::seconds timeLeftInCycle = GetMaxOutboundTimeLeftInCycle_();
-        const uint64_t buffer = timeLeftInCycle / std::chrono::minutes{10} * MaxBlockSize(fDIP0001ActiveAtTip);
+        const uint64_t buffer = timeLeftInCycle / std::chrono::minutes{10} * MaxBlockSize();
         if (buffer >= nMaxOutboundLimit || nMaxOutboundTotalBytesSentInCycle >= nMaxOutboundLimit - buffer)
             return true;
     }

src/test/txvalidation_tests.cpp

@@ -15,6 +15,12 @@
 #include <boost/test/unit_test.hpp>
 
 
+struct TestChain100NoDIP0001Setup : public TestChain100Setup {
+    TestChain100NoDIP0001Setup()
+        : TestChain100Setup{{"-testactivationheight=dip0001@2000"}} {}
+};
+
+
 BOOST_AUTO_TEST_SUITE(txvalidation_tests)
 
 /**
@@ -69,7 +75,7 @@ inline CTransactionRef create_placeholder_tx(size_t num_inputs, size_t num_outpu
     return MakeTransactionRef(mtx);
 }
 
-BOOST_FIXTURE_TEST_CASE(package_tests, TestChain100Setup)
+BOOST_FIXTURE_TEST_CASE(package_tests, TestChain100NoDIP0001Setup)
 {
     LOCK(cs_main);
     unsigned int initialPoolSize = m_node.mempool->size();

src/validation.cpp

@@ -114,9 +114,6 @@ bool fCheckBlockIndex = false;
 bool fCheckpointsEnabled = DEFAULT_CHECKPOINTS_ENABLED;
 int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
 
-// TODO: drop this global variable. Used by net.cpp module only
-std::atomic<bool> fDIP0001ActiveAtTip{false};
-
 uint256 hashAssumeValid;
 arith_uint256 nMinimumChainWork;
 

src/validation.h

@@ -142,8 +142,6 @@ extern int64_t nMaxTipAge;
 extern bool fLargeWorkForkFound;
 extern bool fLargeWorkInvalidChainFound;
 
-extern std::atomic<bool> fDIP0001ActiveAtTip;
-
 /** Block hash whose ancestors we will assume to have valid scripts without checking them. */
 extern uint256 hashAssumeValid;
 

test/functional/feature_block.py

@@ -12,7 +12,6 @@
     create_coinbase,
     create_tx_with_script,
     get_legacy_sigopcount_block,
-    MAX_BLOCK_SIGOPS,
 )
 from test_framework.key import ECKey
 from test_framework.messages import (
@@ -22,7 +21,6 @@
     CTransaction,
     CTxIn,
     CTxOut,
-    MAX_BLOCK_SIZE,
     uint256_from_compact,
     uint256_from_str,
 )
@@ -53,6 +51,11 @@
 from test_framework.util import assert_equal
 from data import invalid_txs
 
+# This functional test assumes DIP0001 is disabled
+# Blocks after activation DIP0001 can not have a transaction bigger than 100k bytes
+MAX_BLOCK_SIZE = 1000000
+MAX_BLOCK_SIGOPS = 20000
+
 #  Use this class for tests that require behavior other than normal p2p behavior.
 #  For now, it is used to serialize a bloated varint (b64).
 class CBrokenBlock(CBlock):
@@ -87,6 +90,7 @@ def set_test_params(self):
             '-dip3params=2000:2000',
             '-acceptnonstdtxn=1',  # This is a consensus block test, we don't care about tx policy
             '-testactivationheight=bip34@2',
+            '-testactivationheight=dip0001@2000',
         ]]
 
     def setup_nodes(self):

test/functional/feature_maxuploadtarget.py

@@ -36,9 +36,8 @@ def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
         self.extra_args = [[
-            "-maxuploadtarget=200",
-            "-blockmaxsize=999000",
-            "-acceptnonstdtxn=1"
+            "-maxuploadtarget=400",
+            "-acceptnonstdtxn=1",
         ]]
         self.supports_cli = False
 
@@ -95,7 +94,7 @@ def run_test(self):
         getdata_request = msg_getdata()
         getdata_request.inv.append(CInv(MSG_BLOCK, big_old_block))
 
-        max_bytes_per_day = 200*1024*1024
+        max_bytes_per_day = 400*1024*1024
         daily_buffer = 144 * MAX_BLOCK_SIZE
         max_bytes_available = max_bytes_per_day - daily_buffer
         success_count = max_bytes_available // old_block_size

test/functional/mempool_accept.py

@@ -41,7 +41,7 @@ class MempoolAcceptanceTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         self.extra_args = [[
-            '-txindex','-permitbaremultisig=0',
+            '-txindex','-permitbaremultisig=0', '-testactivationheight=dip0001@2000',
         ]] * self.num_nodes
         self.supports_cli = False