mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merkle: migrate path arg of MerkleComputation to a reference

Browse Source 
There's a single call to the methods from `ComputeMerklePath` where the last parameter is always provided.
This simplifies the implementation by not having to check for missing parameter.
This commit is contained in:
Lőrinc committed 2025-11-06 10:20:50 +01:00
1 parent 5c5704e730
commit be270551df
1 file changed
+15 -19
Download Patch File Download Diff File Expand all files Collapse all files
src/consensus/merkle.cpp
+15 -19
View File
@@ -85,9 +85,9 @@ uint256 BlockWitnessMerkleRoot(const CBlock& block, bool* mutated)
} }
/* This implements a constant-space merkle root/path calculator, limited to 2^32 leaves. */ /* This implements a constant-space merkle root/path calculator, limited to 2^32 leaves. */
static void MerkleComputation(const std::vector<uint256>& leaves, uint256* proot, bool* pmutated, uint32_t leaf_pos, std::vector<uint256>* path) static void MerkleComputation(const std::vector<uint256>& leaves, uint256* proot, bool* pmutated, uint32_t leaf_pos, std::vector<uint256>& path)
{ {
if (path) path->clear(); path.clear();
Assume(leaves.size() <= UINT32_MAX); Assume(leaves.size() <= UINT32_MAX);
if (leaves.size() == 0) { if (leaves.size() == 0) {
if (pmutated) *pmutated = false; if (pmutated) *pmutated = false;
@@ -115,13 +115,11 @@ static void MerkleComputation(const std::vector<uint256>& leaves, uint256* proot
// corresponds to an inner value that existed before processing the // corresponds to an inner value that existed before processing the
// current leaf, and each needs a hash to combine it. // current leaf, and each needs a hash to combine it.
for (level = 0; !(count & ((uint32_t{1}) << level)); level++) { for (level = 0; !(count & ((uint32_t{1}) << level)); level++) {
if (path) { if (matchh) {
if (matchh) { path.push_back(inner[level]);
path->push_back(inner[level]); } else if (matchlevel == level) {
} else if (matchlevel == level) { path.push_back(h);
path->push_back(h); matchh = true;
matchh = true;
}
} }
mutated |= (inner[level] == h); mutated |= (inner[level] == h);
h = Hash(inner[level], h); h = Hash(inner[level], h);
@@ -147,8 +145,8 @@ static void MerkleComputation(const std::vector<uint256>& leaves, uint256* proot
// If we reach this point, h is an inner value that is not the top. // If we reach this point, h is an inner value that is not the top.
// We combine it with itself (Bitcoin's special rule for odd levels in // We combine it with itself (Bitcoin's special rule for odd levels in
// the tree) to produce a higher level one. // the tree) to produce a higher level one.
if (path && matchh) { if (matchh) {
path->push_back(h); path.push_back(h);
} }
h = Hash(h, h); h = Hash(h, h);
// Increment count to the value it would have if two entries at this // Increment count to the value it would have if two entries at this
@@ -157,13 +155,11 @@ static void MerkleComputation(const std::vector<uint256>& leaves, uint256* proot
level++; level++;
// And propagate the result upwards accordingly. // And propagate the result upwards accordingly.
while (!(count & ((uint32_t{1}) << level))) { while (!(count & ((uint32_t{1}) << level))) {
if (path) { if (matchh) {
if (matchh) { path.push_back(inner[level]);
path->push_back(inner[level]); } else if (matchlevel == level) {
} else if (matchlevel == level) { path.push_back(h);
path->push_back(h); matchh = true;
matchh = true;
}
} }
h = Hash(inner[level], h); h = Hash(inner[level], h);
level++; level++;
@@ -176,7 +172,7 @@ static void MerkleComputation(const std::vector<uint256>& leaves, uint256* proot
static std::vector<uint256> ComputeMerklePath(const std::vector<uint256>& leaves, uint32_t position) { static std::vector<uint256> ComputeMerklePath(const std::vector<uint256>& leaves, uint32_t position) {
std::vector<uint256> ret; std::vector<uint256> ret;
MerkleComputation(leaves, nullptr, nullptr, position, &ret); MerkleComputation(leaves, nullptr, nullptr, position, ret);
return ret; return ret;
} }