Merge 5d6f6fd00d into merged_master (Bitcoin PR bitcoin/bitcoin#31490)

This commit is contained in:
ikripaka 2026-04-10 11:53:22 +00:00
commit bde05e1016
No known key found for this signature in database
21 changed files with 181 additions and 206 deletions

View file

@ -1742,7 +1742,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
g_zmq_notification_interface = CZMQNotificationInterface::Create(
[&chainman = node.chainman](std::vector<uint8_t>& block, const CBlockIndex& index) {
assert(chainman);
return chainman->m_blockman.ReadRawBlockFromDisk(block, WITH_LOCK(cs_main, return index.GetBlockPos()));
return chainman->m_blockman.ReadRawBlock(block, WITH_LOCK(cs_main, return index.GetBlockPos()));
});
if (g_zmq_notification_interface) {