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: balanced binary merkle tree merged proof #6144

Merged
merged 2 commits into from Feb 13, 2024

Conversation

Cifko
Copy link
Contributor

@Cifko Cifko commented Feb 12, 2024

Description

We now check if all the paths are correct. If they are not left dangling, if they merge into one and that computes the root hash.

How Has This Been Tested?

cargo test --package tari_mmr --lib -- balanced_binary_merkle_proof::test --nocapture

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

Same test, but it would be nice to confirm my approach as well.

Breaking Changes

  • None
  • Requires data directory on base node to be deleted
  • Requires hard fork
  • Other - Please specify

Copy link

github-actions bot commented Feb 12, 2024

Test Results (CI)

1 270 tests   1 270 ✅  11m 43s ⏱️
   39 suites      0 💤
    1 files        0 ❌

Results for commit 9283e74.

♻️ 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 Feb 12, 2024
Copy link

github-actions bot commented Feb 12, 2024

Test Results (Integration tests)

 2 files  11 suites   14m 39s ⏱️
29 tests 28 ✅ 0 💤 1 ❌
30 runs  29 ✅ 0 💤 1 ❌

For more details on these failures, see this check.

Results for commit 9283e74.

♻️ This comment has been updated with latest results.

stringhandler
stringhandler previously approved these changes Feb 13, 2024
@ghpbot-tari-project ghpbot-tari-project removed the P-reviews_required Process - Requires a review from a lead maintainer to be merged label Feb 13, 2024
SWvheerden
SWvheerden previously approved these changes Feb 13, 2024
Copy link
Collaborator

@SWvheerden SWvheerden left a comment

Choose a reason for hiding this comment

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

Just need green CI

@Cifko Cifko dismissed stale reviews from SWvheerden and stringhandler via a6b7794 February 13, 2024 09:10
@ghpbot-tari-project ghpbot-tari-project added the P-reviews_required Process - Requires a review from a lead maintainer to be merged label Feb 13, 2024
@SWvheerden SWvheerden changed the title fix: balanced binary merkle tree merged proof feat: balanced binary merkle tree merged proof Feb 13, 2024
@SWvheerden SWvheerden changed the title feat: balanced binary merkle tree merged proof fix: balanced binary merkle tree merged proof Feb 13, 2024
@SWvheerden SWvheerden merged commit 4d01653 into tari-project:development Feb 13, 2024
11 of 16 checks passed
sdbondi added a commit to sdbondi/tari that referenced this pull request Feb 15, 2024
* development: (120 commits)
  chore: use log4rs 1.3 (tari-project#6148)
  fix: balanced binary merkle tree merged proof (tari-project#6144)
  chore(deps): bump libgit2-sys from 0.16.1+1.7.1 to 0.16.2+1.7.2 (tari-project#6145)
  feat: allow ffi to see lock height (tari-project#6140)
  chore(ci): add metrics targeted build, remove miner artifacts, misc clean ups (tari-project#6141)
  chore: suppress error (tari-project#6137)
  chore: fix versions to correct version (tari-project#6135)
  chore: add stringhandler gpg (tari-project#6134)
  chore: add pgp public key (tari-project#6139)
  feat: turn off node metrics by default (tari-project#6073)
  feat: add import tx method (tari-project#6132)
  chore: update pgp public key (tari-project#6129)
  chore: new testnet release (tari-project#6127)
  chore: update pgp key (tari-project#6128)
  fix(libtor): prevent metrics port conflict (tari-project#6125)
  fix(comms): correctly initialize hidden service (tari-project#6124)
  chore: make MAC equality check more idiomatic (tari-project#6123)
  chore: new release (tari-project#6120)
  fix: restart tx fix (tari-project#6119)
  chore: suppress warn log (tari-project#6118)
  ...
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

4 participants