Skip to content

Commit dbb067d

Browse files
author
MarcoFalke
committed
Merge #18379: doc: Comment fix merkle.cpp
5b59a19 Update merkle.cpp (4d55397500) Pull request description: Change comment from `The reason is that if the number of hashes in the list at a given time is odd`, to ` The reason is that if the number of hashes in the list at a given level is odd` (to be a bit more precise: replacing `time` with `level`) <!-- *** Please remove the following help text before submitting: *** Pull requests without a rationale and clear improvement may be closed immediately. --> <!-- Please provide clear motivation for your patch and explain how it improves Bitcoin Core user experience or Bitcoin Core developer experience significantly: * Any test improvements or new tests that improve coverage are always welcome. * All other changes should have accompanying unit tests (see `src/test/`) or functional tests (see `test/`). Contributors should note which tests cover modified code. If no tests exist for a region of modified code, new tests should accompany the change. * Bug fixes are most welcome when they come with steps to reproduce or an explanation of the potential issue as well as reasoning for the way the bug was fixed. * Features are welcome, but might be rejected due to design or scope issues. If a feature is based on a lot of dependencies, contributors should first consider building the system outside of Bitcoin Core, if possible. * Refactoring changes are only accepted if they are required for a feature or bug fix or otherwise improve developer experience significantly. For example, most "code style" refactoring changes require a thorough explanation why they are useful, what downsides they have and why they *significantly* improve developer experience or avoid serious programming bugs. Note that code style is often a subjective matter. Unless they are explicitly mentioned to be preferred in the [developer notes](/doc/developer-notes.md), stylistic code changes are usually rejected. --> <!-- Bitcoin Core has a thorough review process and even the most trivial change needs to pass a lot of eyes and requires non-zero or even substantial time effort to review. There is a huge lack of active reviewers on the project, so patches often sit for a long time. --> ACKs for top commit: MarcoFalke: ACK 5b59a19 instagibbs: ACK bitcoin/bitcoin@5b59a19 Tree-SHA512: 30d29b9855b30de8b54033ca4884cfb5bf8ab9e52cf61da237abba0e15ebff947c65f8ba82175694bc60ee0d54f940a098cadcb0404d3c3bcf577006ab0561a5
2 parents 3a8d250 + 5b59a19 commit dbb067d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/consensus/merkle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
that the following merkle tree algorithm has a serious flaw related to
1111
duplicate txids, resulting in a vulnerability (CVE-2012-2459).
1212
13-
The reason is that if the number of hashes in the list at a given time
13+
The reason is that if the number of hashes in the list at a given level
1414
is odd, the last one is duplicated before computing the next level (which
1515
is unusual in Merkle trees). This results in certain sequences of
1616
transactions leading to the same merkle root. For example, these two

0 commit comments

Comments
 (0)