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

v2.0: adds feature-gate code to enforce retransmitter signature verification (backport of #1840) #2415

Merged
merged 2 commits into from
Aug 14, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 2, 2024

Problem

Need to verify if the shred is retransmitted by the expected parent node in Turbine tree.

Summary of Changes

Added feature-gate code to enforce retransmitter signature verification


This is an automatic backport of pull request #1840 done by [Mergify](https://mergify.com).

#1840)

(cherry picked from commit 79cb077)

# Conflicts:
#	sdk/src/feature_set.rs
@mergify mergify bot requested a review from a team as a code owner August 2, 2024 18:04
@mergify mergify bot added the conflicts label Aug 2, 2024
Copy link
Author

mergify bot commented Aug 2, 2024

Cherry-pick of 79cb077 has failed:

On branch mergify/bp/v2.0/pr-1840
Your branch is up to date with 'origin/v2.0'.

You are currently cherry-picking commit 79cb077f10.
  (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:   turbine/src/sigverify_shreds.rs

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

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

@behzadnouri behzadnouri requested review from AshwinSekar and bw-solana and removed request for AshwinSekar and bw-solana August 2, 2024 18:04
@behzadnouri behzadnouri added the automerge automerge Merge this Pull Request automatically once CI passes label Aug 2, 2024
Copy link

@bw-solana bw-solana left a comment

Choose a reason for hiding this comment

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

LGTM

@mergify mergify bot merged commit 54d08d7 into v2.0 Aug 14, 2024
41 checks passed
@mergify mergify bot deleted the mergify/bp/v2.0/pr-1840 branch August 14, 2024 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants