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

v1.14: removes the merkle root from shreds binary (backport of #29427) #30613

Merged
merged 2 commits into from
Mar 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 6, 2023

This is an automatic backport of pull request #29427 done by Mergify.
Cherry-pick of cf0a149 has failed:

On branch mergify/bp/v1.14/pr-29427
Your branch is up to date with 'origin/v1.14'.

You are currently cherry-picking commit cf0a149ad.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ledger/src/shred/merkle.rs
	modified:   ledger/src/shred/shred_data.rs
	modified:   ledger/src/sigverify_shreds.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/src/shred.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

#29445
makes it unnecessary to embed merkle roots into shreds binary. This
commit removes the merkle root from shreds binary.

This adds 20 bytes to shreds capacity to store more data.
Additionally since we no longer need to truncate the merkle root, the
signature would be on the full 32 bytes of hash as opposed to the
truncated one.

Also signature verification would now effectively verify merkle proof as
well, so we no longer need to verify merkle proof in the sanitize
implementation.

(cherry picked from commit cf0a149)

# Conflicts:
#	ledger/src/shred.rs
@behzadnouri behzadnouri force-pushed the mergify/bp/v1.14/pr-29427 branch from d4207e5 to 8bbb543 Compare March 6, 2023 17:08
@behzadnouri behzadnouri requested a review from jbiseda March 6, 2023 19:17
@behzadnouri behzadnouri merged commit 8c6b6c1 into v1.14 Mar 7, 2023
@behzadnouri behzadnouri deleted the mergify/bp/v1.14/pr-29427 branch March 7, 2023 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants