diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-07-14 17:37:54 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-07-14 17:49:48 -0700 |
| commit | f90603ac6d24f5263649675d51233f1fce8b2ecd (patch) | |
| tree | e2e2b4f29859a255db00b479d2dae30b70139d0c /src/merkleblock.cpp | |
| parent | b7d6623c76e1468f2a93db5a3120580e2784d74a (diff) | |
| parent | 3babbcb48786372d4b22171674c4cc5a6220c294 (diff) | |
Merge #10618: Remove confusing MAX_BLOCK_BASE_SIZE.
3babbcb48 Remove confusing MAX_BLOCK_BASE_SIZE. (Gregory Maxwell)
Tree-SHA512: 361293fc4e1e379cd5a0908ed0866a00e1c7a771bdf02fded158fca21b492a29c7a67fea0d13dc40b2a04204c89823bf1836fe5b63a17c9747751b9c845a3527
Diffstat (limited to 'src/merkleblock.cpp')
| -rw-r--r-- | src/merkleblock.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index 78d7cd6001..ba5f7b400c 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -153,7 +153,7 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch, std::ve if (nTransactions == 0) return uint256(); // check for excessively high numbers of transactions - if (nTransactions > MAX_BLOCK_BASE_SIZE / 60) // 60 is the lower bound for the size of a serialized CTransaction + if (nTransactions > MAX_BLOCK_WEIGHT / MIN_TRANSACTION_WEIGHT) return uint256(); // there can never be more hashes provided than one for every txid if (vHash.size() > nTransactions) |