Merge f6013265b7 into merged_master (Bitcoin PR bitcoin/bitcoin#20295)

This commit is contained in:
Byron Hambly 2023-06-06 09:10:04 +00:00
commit b0b2f3deff
18 changed files with 296 additions and 93 deletions

View file

@ -3840,6 +3840,7 @@ bool CChainState::AcceptBlock(const std::shared_ptr<const CBlock>& pblock, Block
// This requires some new chain data structure to efficiently look up if a
// block is in a chain leading to a candidate for best tip, despite not
// being such a candidate itself.
// Note that this would break the getblockfrompeer RPC
// TODO: deal better with return value and error conditions for duplicate
// and unrequested blocks.