test

Author: ComputerCraftr

src/index/coinstatsindex.cpp

@@ -118,29 +118,31 @@ bool CoinStatsIndex::CustomAppend(const interfaces::BlockInfo& block)
     const CAmount block_subsidy{GetBlockSubsidy(block.height, Params().GetConsensus())};
     m_total_subsidy += block_subsidy;
 
-    // Ignore genesis block
-    if (block.height > 0) {
+    // Include genesis block
+    if (block.height >= 0) {
         // pindex variable gives indexing code access to node internals. It
         // will be removed in upcoming commit
         const CBlockIndex* pindex = WITH_LOCK(cs_main, return m_chainstate->m_blockman.LookupBlockIndex(block.hash));
         if (!m_chainstate->m_blockman.ReadBlockUndo(block_undo, *pindex)) {
             return false;
         }
 
-        std::pair<uint256, DBVal> read_out;
-        if (!m_db->Read(DBHeightKey(block.height - 1), read_out)) {
-            return false;
-        }
+        if (block.height > 0) {
+            std::pair<uint256, DBVal> read_out;
+            if (!m_db->Read(DBHeightKey(block.height - 1), read_out)) {
+                return false;
+            }
 
-        uint256 expected_block_hash{*Assert(block.prev_hash)};
-        if (read_out.first != expected_block_hash) {
-            LogPrintf("WARNING: previous block header belongs to unexpected block %s; expected %s\n",
-                      read_out.first.ToString(), expected_block_hash.ToString());
+            uint256 expected_block_hash{*Assert(block.prev_hash)};
+            if (read_out.first != expected_block_hash) {
+                LogPrintf("WARNING: previous block header belongs to unexpected block %s; expected %s\n",
+                        read_out.first.ToString(), expected_block_hash.ToString());
 
-            if (!m_db->Read(DBHashKey(expected_block_hash), read_out)) {
-                LogError("%s: previous block header not found; expected %s\n",
-                             __func__, expected_block_hash.ToString());
-                return false;
+                if (!m_db->Read(DBHashKey(expected_block_hash), read_out)) {
+                    LogError("%s: previous block header not found; expected %s\n",
+                                __func__, expected_block_hash.ToString());
+                    return false;
+                }
             }
         }
 
@@ -413,25 +415,27 @@ bool CoinStatsIndex::ReverseBlock(const CBlock& block, const CBlockIndex* pindex
     const CAmount block_subsidy{GetBlockSubsidy(pindex->nHeight, Params().GetConsensus())};
     m_total_subsidy -= block_subsidy;
 
-    // Ignore genesis block
-    if (pindex->nHeight > 0) {
+    // Include genesis block
+    if (pindex->nHeight >= 0) {
         if (!m_chainstate->m_blockman.ReadBlockUndo(block_undo, *pindex)) {
             return false;
         }
 
-        if (!m_db->Read(DBHeightKey(pindex->nHeight - 1), read_out)) {
-            return false;
-        }
+        if (pindex->nHeight > 0) {
+            if (!m_db->Read(DBHeightKey(pindex->nHeight - 1), read_out)) {
+                return false;
+            }
 
-        uint256 expected_block_hash{pindex->pprev->GetBlockHash()};
-        if (read_out.first != expected_block_hash) {
-            LogPrintf("WARNING: previous block header belongs to unexpected block %s; expected %s\n",
-                      read_out.first.ToString(), expected_block_hash.ToString());
+            uint256 expected_block_hash{pindex->pprev->GetBlockHash()};
+            if (read_out.first != expected_block_hash) {
+                LogPrintf("WARNING: previous block header belongs to unexpected block %s; expected %s\n",
+                        read_out.first.ToString(), expected_block_hash.ToString());
 
-            if (!m_db->Read(DBHashKey(expected_block_hash), read_out)) {
-                LogError("%s: previous block header not found; expected %s\n",
-                             __func__, expected_block_hash.ToString());
-                return false;
+                if (!m_db->Read(DBHashKey(expected_block_hash), read_out)) {
+                    LogError("%s: previous block header not found; expected %s\n",
+                                __func__, expected_block_hash.ToString());
+                    return false;
+                }
             }
         }
     }

src/kernel/chainparams.cpp

@@ -618,7 +618,7 @@ class CRegTestParams : public CChainParams
         m_assumeutxo_data = {
             {   // For use by unit tests
                 .height = 110,
-                .hash_serialized = AssumeutxoHash{uint256{"6657b736d4fe4db0cbc796789e812d5dba7f5c143764b1b6905612f1830609d1"}},
+                .hash_serialized = AssumeutxoHash{uint256{"96081d2bf33374a10056f43e978c2d77b333c0541ee917aae2d878476d930056"}},
                 .m_chain_tx_count = 111,
                 .blockhash = consteval_ctor(uint256{"696e92821f65549c7ee134edceeeeaaa4105647a3c4fd9f298c0aec0ab50425c"}),
             },

src/node/blockstorage.cpp

@@ -255,7 +255,7 @@ void BlockManager::PruneOneBlockFile(const int fileNumber)
             // to be downloaded again in order to consider its chain, at which
             // point it would be considered as a candidate for
             // m_blocks_unlinked or setBlockIndexCandidates.
-            auto range = m_blocks_unlinked.equal_range(pindex->pprev);
+            auto range = m_blocks_unlinked.equal_range(pindex->pprev ? pindex->pprev : pindex);
             while (range.first != range.second) {
                 std::multimap<CBlockIndex*, CBlockIndex*>::iterator _it = range.first;
                 range.first++;
@@ -685,7 +685,7 @@ bool BlockManager::ReadBlockUndo(CBlockUndo& blockundo, const CBlockIndex& index
     uint256 hashChecksum;
     HashVerifier verifier{filein}; // Use HashVerifier as reserializing may lose data, c.f. commit d342424301013ec47dc146a4beb49d5c9319d80a
     try {
-        verifier << index.pprev->GetBlockHash();
+        verifier << (index.pprev ? index.pprev->GetBlockHash() : uint256::ZERO);
         verifier >> blockundo;
         filein >> hashChecksum;
     } catch (const std::exception& e) {
@@ -966,7 +966,7 @@ bool BlockManager::WriteBlockUndo(const CBlockUndo& blockundo, BlockValidationSt
 
         // Calculate & write checksum
         HashWriter hasher{};
-        hasher << block.pprev->GetBlockHash();
+        hasher << (block.pprev ? block.pprev->GetBlockHash() : uint256::ZERO);
         hasher << blockundo;
         fileout << hasher.GetHash();
 

src/test/validation_chainstatemanager_tests.cpp

@@ -188,10 +188,15 @@ struct SnapshotTestSetup : TestChain100Setup {
             LOCK(::cs_main);
             BOOST_CHECK(!chainman.IsSnapshotValidated());
             BOOST_CHECK(!node::FindSnapshotChainstateDir(chainman.m_options.datadir));
+
+            const CBlock& genesis = chainman.GetParams().GenesisBlock();
+            if (std::find(m_coinbase_txns.begin(), m_coinbase_txns.end(), genesis.vtx[0]) == m_coinbase_txns.end()) {
+                m_coinbase_txns.push_back(genesis.vtx[0]);
+            }
         }
 
         size_t initial_size;
-        size_t initial_total_coins{100};
+        size_t initial_total_coins{101};
 
         // Make some initial assertions about the contents of the chainstate.
         {

src/test/validation_tests.cpp

@@ -142,11 +142,11 @@ BOOST_AUTO_TEST_CASE(test_assumeutxo)
     }
 
     const auto out110 = *params->AssumeutxoForHeight(110);
-    BOOST_CHECK_EQUAL(out110.hash_serialized.ToString(), "6657b736d4fe4db0cbc796789e812d5dba7f5c143764b1b6905612f1830609d1");
+    BOOST_CHECK_EQUAL(out110.hash_serialized.ToString(), "96081d2bf33374a10056f43e978c2d77b333c0541ee917aae2d878476d930056");
     BOOST_CHECK_EQUAL(out110.m_chain_tx_count, 111U);
 
     const auto out110_2 = *params->AssumeutxoForBlockhash(uint256{"696e92821f65549c7ee134edceeeeaaa4105647a3c4fd9f298c0aec0ab50425c"});
-    BOOST_CHECK_EQUAL(out110_2.hash_serialized.ToString(), "6657b736d4fe4db0cbc796789e812d5dba7f5c143764b1b6905612f1830609d1");
+    BOOST_CHECK_EQUAL(out110_2.hash_serialized.ToString(), "96081d2bf33374a10056f43e978c2d77b333c0541ee917aae2d878476d930056");
     BOOST_CHECK_EQUAL(out110_2.m_chain_tx_count, 111U);
 }
 

src/validation.cpp

@@ -2269,7 +2269,7 @@ int ApplyTxInUndo(Coin&& undo, CCoinsViewCache& view, const COutPoint& out, cons
     if (view.HaveCoin(out)) fClean = false; // overwriting transaction output
 
     // We have to exclude the genesis coinbase from this check because its height actually is zero and the wallet will think there is database corruption otherwise
-    if (undo.nHeight == 0 && out.hash != genesisTxid) {
+    if (undo.nHeight == 0 && (!undo.fCoinBase || out.hash != genesisTxid)) {
         // Missing undo metadata (height and coinbase). Older versions included this
         // information only in undo records for the last spend of a transactions'
         // outputs. This implies that it must be present for some other output of the same tx.
@@ -2742,7 +2742,7 @@ bool Chainstate::ConnectBlock(const CBlock& block, BlockValidationState& state,
         return true;
     }
 
-    if (pindex->GetBlockHash() != params.GetConsensus().hashGenesisBlock && !m_blockman.WriteBlockUndo(blockundo, state, *pindex)) {
+    if (!m_blockman.WriteBlockUndo(blockundo, state, *pindex)) {
         return false;
     }