Skip to content

Resolve merkle branch padding siblings from the duplicated own node. #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 1 commit into from
Sep 20, 2026
Merged

Resolve merkle branch padding siblings from the duplicated own node. #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions include/bitcoin/database/impl/query/merkle.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,19 +151,13 @@ void CLASS::merge_merkle(hashes& path, hashes&& leaves, size_t first,

for (const auto& row: merkle_branch(first, size + lift))
{
hashes subroot{};
if (const auto leaf = row.sibling * row.width; leaf < size)
{
const auto count = std::min(row.width, size - leaf);
const auto next = std::next(leaves.begin(), leaf);
const auto it = std::make_move_iterator(next);
subroot = { it, std::next(it, count) };
}
else
{
subroot = { std::move(leaves.back()) };
}

// A sibling above the leaves is the duplicate of the own node.
const auto sibling = row.sibling * row.width;
const auto leaf = sibling < size ? sibling : sibling - row.width;
const auto count = std::min(row.width, size - leaf);
const auto next = std::next(leaves.begin(), leaf);
const auto it = std::make_move_iterator(next);
hashes subroot(it, std::next(it, count));
path.push_back(partial_subroot(std::move(subroot), row.width));
}
}
Expand Down
20 changes: 20 additions & 0 deletions test/query/merkle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,26 @@ BOOST_AUTO_TEST_CASE(query_merkle__merge_merkle__four_leaves_target_three__expec
BOOST_CHECK_EQUAL(to[1], test::root01);
}

BOOST_AUTO_TEST_CASE(query_merkle__merge_merkle__six_leaves_target_five__expected)
{
hashes to{};
hashes from
{
test::block0_hash,
test::block1_hash,
test::block2_hash,
test::block3_hash,
test::block4_hash,
test::block5_hash
};

merkle_accessor::merge_merkle(to, std::move(from), 5, 0);
BOOST_CHECK_EQUAL(to.size(), 3u);
BOOST_CHECK_EQUAL(to[0], test::block4_hash);
BOOST_CHECK_EQUAL(to[1], test::root45);
BOOST_CHECK_EQUAL(to[2], test::root03);
}

// get_merkle_proof

BOOST_AUTO_TEST_CASE(query_merkle__get_merkle_proof__no_confirmed_blocks__error_merkle_proof)
Expand Down
Loading