mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge 5d6f6fd00d into merged_master (Bitcoin PR bitcoin/bitcoin#31490)
This commit is contained in:
commit
bde05e1016
21 changed files with 181 additions and 206 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue