Merge 606e306277 into merged_master (Bitcoin PR bitcoin/bitcoin#22981)

This commit is contained in:
Byron Hambly 2023-05-26 13:47:21 +00:00
commit 8250bf53d2
10 changed files with 29 additions and 29 deletions

View file

@ -1032,7 +1032,7 @@ static RPCHelpMan submitblock()
bool new_block;
auto sc = std::make_shared<submitblock_StateCatcher>(block.GetHash());
RegisterSharedValidationInterface(sc);
bool accepted = chainman.ProcessNewBlock(Params(), blockptr, /* fForceProcessing */ true, /* fNewBlock */ &new_block);
bool accepted = chainman.ProcessNewBlock(Params(), blockptr, /*force_processing=*/true, /*new_block=*/&new_block);
UnregisterSharedValidationInterface(sc);
if (!new_block && accepted) {
return "duplicate";