GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 640eb772e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25064)

Browse source
This commit is contained in:
James Dorfman 2024-08-13 20:52:56 +00:00
commit bfb0f5d1e1
13 changed files with 76 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/interfaces.cpp
View file

@ -733,7 +733,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, fCheckPOW, fCheckMerkleRoot);
return TestBlockValidity(state, chainparams, m_node.chainman->ActiveChainstate(), block, pindexPrev, GetAdjustedTime, fCheckPOW, fCheckMerkleRoot);
}
// end ELEMENTS
NodeContext& m_node;