Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

recovers merkle shreds from erasure codes (backport #27136)#27274

Merged
mergify[bot] merged 2 commits intov1.11from
mergify/bp/v1.11/pr-27136
Aug 20, 2022
Merged

recovers merkle shreds from erasure codes (backport #27136)#27274
mergify[bot] merged 2 commits intov1.11from
mergify/bp/v1.11/pr-27136

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Aug 19, 2022

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

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

You are currently cherry-picking commit c0b63351a.
  (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:   Cargo.lock
	modified:   ledger/src/blockstore.rs
	modified:   ledger/src/shred.rs
	modified:   ledger/src/shred/merkle.rs
	modified:   ledger/src/shredder.rs

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

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

The commit
* Identifies Merkle shreds when recovering from erasure codes and
  dispatches specialized code to reconstruct shreds.
* Coding shred headers are added to recovered erasure shards.
* Merkle tree is reconstructed for the erasure batch and added to
  recovered shreds.
* The common signature (for the root of Merkle tree) is attached to all
  recovered shreds.

(cherry picked from commit c0b6335)

# Conflicts:
#	ledger/Cargo.toml
@mergify mergify bot added the conflicts label Aug 19, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 19, 2022
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Aug 19, 2022
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 19, 2022
@mergify mergify bot merged commit 0041bc2 into v1.11 Aug 20, 2022
@mergify mergify bot deleted the mergify/bp/v1.11/pr-27136 branch August 20, 2022 01:44
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants