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.17: replay: feature flag consumption of duplicate proofs from blockstore (backport of #34372) #34515

Merged
merged 2 commits into from
Dec 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 19, 2023

This is an automatic backport of pull request #34372 done by Mergify.
Cherry-pick of 4a8d27d has failed:

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

You are currently cherry-picking commit 4a8d27d921.
  (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:   core/src/replay_stage.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/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

…34372)

* replay: feature flag consumption of duplicate proofs from blockstore

* pr feedback: reorder check, add flag for restart logic

(cherry picked from commit 4a8d27d)

# Conflicts:
#	sdk/src/feature_set.rs
@mergify mergify bot added conflicts feature-gate Pull Request adds or modifies a runtime feature gate labels Dec 19, 2023
Copy link

codecov bot commented Dec 19, 2023

Codecov Report

Merging #34515 (515587b) into v1.17 (9a328fb) will decrease coverage by 0.1%.
The diff coverage is 71.4%.

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.17   #34515     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         803      803             
  Lines      218181   218191     +10     
=========================================
+ Hits       178519   178525      +6     
- Misses      39662    39666      +4     

@AshwinSekar AshwinSekar merged commit f7a655f into v1.17 Dec 19, 2023
33 checks passed
@AshwinSekar AshwinSekar deleted the mergify/bp/v1.17/pr-34372 branch December 19, 2023 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts feature-gate Pull Request adds or modifies a runtime feature gate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants