Merge e30b6ea194 into merged_master (Bitcoin PR bitcoin/bitcoin#24067)

This commit is contained in:
Byron Hambly 2023-06-28 14:35:14 +00:00
commit ccd7b72d79
15 changed files with 56 additions and 56 deletions

View file

@ -486,11 +486,6 @@ public:
const CChain& active = Assert(m_node.chainman)->ActiveChain();
return active.GetLocator();
}
bool checkFinalTx(const CTransaction& tx) override
{
LOCK(cs_main);
return CheckFinalTx(chainman().ActiveChain().Tip(), tx);
}
std::optional<int> findLocatorFork(const CBlockLocator& locator) override
{
LOCK(cs_main);