diff options
| author | Pieter Wuille <[email protected]> | 2016-11-07 17:59:46 -0800 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2016-11-07 18:11:18 -0800 |
| commit | dc6b9406bdfab2af8c86cb080cb3e6cf8f2385d8 (patch) | |
| tree | 52b9d3a28947a91d627574d370815cc705b63351 /src/blockencodings.cpp | |
| parent | Merge #9045: Hash P2P messages as they are received instead of at process-time (diff) | |
| parent | Bump the protocol version to distinguish new banning behavior. (diff) | |
| download | discoin-dc6b9406bdfab2af8c86cb080cb3e6cf8f2385d8.tar.xz discoin-dc6b9406bdfab2af8c86cb080cb3e6cf8f2385d8.zip | |
Merge #9026: Fix handling of invalid compact blocks
d4833ff Bump the protocol version to distinguish new banning behavior. (Suhas Daftuar)
88c3549 Fix compact block handling to not ban if block is invalid (Suhas Daftuar)
c93beac [qa] Test that invalid compactblocks don't result in ban (Suhas Daftuar)
Diffstat (limited to 'src/blockencodings.cpp')
| -rw-r--r-- | src/blockencodings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp index 93d3fa372..737102f16 100644 --- a/src/blockencodings.cpp +++ b/src/blockencodings.cpp @@ -167,7 +167,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector< // check its own merkle root and cache that check. if (state.CorruptionPossible()) return READ_STATUS_FAILED; // Possible Short ID collision - return READ_STATUS_INVALID; + return READ_STATUS_CHECKBLOCK_FAILED; } LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool and %lu txn requested\n", header.GetHash().ToString(), prefilled_count, mempool_count, vtx_missing.size()); |