Merge 3c13f5d612 into merged_master (Bitcoin PR bitcoin/bitcoin#28956)

This commit is contained in:
Byron Hambly 2025-11-29 14:05:38 +02:00
commit b15f9acb3d
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
15 changed files with 17 additions and 32 deletions

View file

@ -834,7 +834,7 @@ public:
bool testBlockValidity(BlockValidationState& state, const CChainParams& chainparams, const CBlock& block, CBlockIndex* pindexPrev, bool fCheckPOW, bool fCheckMerkleRoot) override {
LOCK(::cs_main);
Assert(m_node.chainman);
return TestBlockValidity(state, chainparams, m_node.chainman->ActiveChainstate(), block, pindexPrev, GetAdjustedTime, fCheckPOW, fCheckMerkleRoot);
return TestBlockValidity(state, chainparams, m_node.chainman->ActiveChainstate(), block, pindexPrev, fCheckPOW, fCheckMerkleRoot);
}
// end ELEMENTS