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

Allow validators to reset to the slot which matches their last voted slot (backport #28172) - #28186

Merged
mergify[bot] merged 1 commit into
v1.13from
mergify/bp/v1.13/pr-28172
Oct 3, 2022
Merged

mergify[bot] merged 1 commit into
v1.13from
mergify/bp/v1.13/pr-28172

Conversation

@mergify

@mergify mergify Bot commented Oct 3, 2022

Copy link
Copy Markdown
Contributor

This is an automatic backport of pull request #28172 done by Mergify.


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

…slot (#28172)

* Add failing test

* Allow resetting to duplicate was confirmed

* feedback

* feedback

* bump

* simplify change

* Revert "simplify change"

This reverts commit 72e5de3.

* update comment

* Update core/src/replay_stage.rs

(cherry picked from commit c2bb2b8)
@mergify mergify Bot assigned jstarry Oct 3, 2022
@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Oct 3, 2022
@mergify

mergify Bot commented Oct 3, 2022

Copy link
Copy Markdown
Contributor Author

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Oct 3, 2022
@mergify

mergify Bot commented Oct 3, 2022

Copy link
Copy Markdown
Contributor Author

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Oct 3, 2022
@mergify
mergify Bot merged commit fc6b575 into v1.13 Oct 3, 2022
@mergify
mergify Bot deleted the mergify/bp/v1.13/pr-28172 branch October 3, 2022 12:30
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant