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

adds shred::layout::get_signed_data (backport #29438) #29854

Merged
merged 2 commits into from
Jan 24, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2023

This is an automatic backport of pull request #29438 done by Mergify.
Cherry-pick of 50afb80 has failed:

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

You are currently cherry-picking commit 50afb80f5.
  (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/legacy.rs
	modified:   ledger/src/shred/merkle.rs
	modified:   ledger/src/shred/shred_code.rs
	modified:   ledger/src/shred/shred_data.rs
	modified:   ledger/src/shred/traits.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

Working towards removing merkle root from shreds payload, the commit
implements api to obtain signed data from shreds binary.

(cherry picked from commit 50afb80)

# Conflicts:
#	ledger/src/shred.rs
@behzadnouri behzadnouri removed their assignment Jan 24, 2023
@behzadnouri behzadnouri merged commit 9838806 into v1.14 Jan 24, 2023
@behzadnouri behzadnouri deleted the mergify/bp/v1.14/pr-29438 branch January 24, 2023 17:40
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.

1 participant