Skip to content
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.

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

fix!: change position calculation in MTparams for mergemining #6339

Merged
merged 2 commits into from
May 20, 2024

Conversation

SWvheerden
Copy link
Collaborator

Description

Changes the way we calculate the position of the hash from the Merkle tree params

Motivation and Context

Its possible to have the same proof for different sized merkle trees. Verification needs to verify the total size from the decoded merkle tree params

What process can a PR reviewer use to test or verify this change?

Ensure it's the same as here: https://github.com/SChernykh/p2pool/blob/2c549f61a46a5f4f0be7c631dff6e928f73a52e2/src/merkle.cpp#L341-L369

@SWvheerden SWvheerden requested a review from a team as a code owner May 15, 2024 15:29
Copy link

github-actions bot commented May 15, 2024

Test Results (CI)

    3 files    120 suites   40m 3s ⏱️
1 280 tests 1 279 ✅ 0 💤 1 ❌
3 832 runs  3 831 ✅ 0 💤 1 ❌

For more details on these failures, see this check.

Results for commit b4bfaa8.

♻️ This comment has been updated with latest results.

@ghpbot-tari-project ghpbot-tari-project added P-acks_required Process - Requires more ACKs or utACKs P-reviews_required Process - Requires a review from a lead maintainer to be merged labels May 15, 2024
Copy link

github-actions bot commented May 15, 2024

Test Results (Integration tests)

 2 files  11 suites   40m 24s ⏱️
33 tests 32 ✅ 0 💤 1 ❌
35 runs  32 ✅ 0 💤 3 ❌

For more details on these failures, see this check.

Results for commit b4bfaa8.

♻️ This comment has been updated with latest results.

hansieodendaal
hansieodendaal previously approved these changes May 17, 2024
Copy link
Contributor

@hansieodendaal hansieodendaal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@ghpbot-tari-project ghpbot-tari-project removed the P-reviews_required Process - Requires a review from a lead maintainer to be merged label May 17, 2024
@SWvheerden SWvheerden changed the title fix: change position calculation in MTparams for mergemining fix!: change position calculation in MTparams for mergemining May 20, 2024
@ghpbot-tari-project ghpbot-tari-project added the P-reviews_required Process - Requires a review from a lead maintainer to be merged label May 20, 2024
@SWvheerden SWvheerden merged commit 1d6e0d8 into tari-project:development May 20, 2024
12 of 16 checks passed
@SWvheerden SWvheerden deleted the sw_change_mm_data_pos branch May 30, 2024 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P-acks_required Process - Requires more ACKs or utACKs P-reviews_required Process - Requires a review from a lead maintainer to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants