mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge 3c13f5d612 into merged_master (Bitcoin PR bitcoin/bitcoin#28956)
This commit is contained in:
commit
b15f9acb3d
15 changed files with 17 additions and 32 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue