mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge 1e9d367d0d into merged_master (Bitcoin PR bitcoin/bitcoin#28423)
This commit is contained in:
commit
61847fc900
34 changed files with 96 additions and 57 deletions
|
|
@ -23,6 +23,7 @@
|
|||
#include <hash.h>
|
||||
#include <kernel/chainparams.h>
|
||||
#include <kernel/mempool_entry.h>
|
||||
#include <kernel/messagestartchars.h>
|
||||
#include <kernel/notifications_interface.h>
|
||||
#include <logging.h>
|
||||
#include <logging/timer.h>
|
||||
|
|
@ -5077,11 +5078,11 @@ void ChainstateManager::LoadExternalBlockFile(
|
|||
unsigned int nSize = 0;
|
||||
try {
|
||||
// locate a header
|
||||
unsigned char buf[CMessageHeader::MESSAGE_START_SIZE];
|
||||
MessageStartChars buf;
|
||||
blkdat.FindByte(std::byte(params.MessageStart()[0]));
|
||||
nRewind = blkdat.GetPos() + 1;
|
||||
blkdat >> buf;
|
||||
if (memcmp(buf, params.MessageStart(), CMessageHeader::MESSAGE_START_SIZE)) {
|
||||
if (buf != params.MessageStart()) {
|
||||
continue;
|
||||
}
|
||||
// read size
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue