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

fix(x/staking): Refactor GetLastValidators (backport #19226) #19231

Closed
wants to merge 4 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 25, 2024

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

On branch mergify/bp/release/v0.47.x/pr-19226
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit a69836b3b.
  (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:   x/staking/keeper/validator_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/staking/keeper/validator.go

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

(cherry picked from commit a69836b)

# Conflicts:
#	CHANGELOG.md
#	x/staking/keeper/validator.go
@mergify mergify bot requested a review from a team as a code owner January 25, 2024 00:39
@mergify mergify bot added the conflicts label Jan 25, 2024
x/staking/keeper/validator.go Fixed Show fixed Hide fixed
x/staking/keeper/validator.go Fixed Show fixed Hide fixed
@alexanderbez alexanderbez self-assigned this Jan 25, 2024
@tac0turtle
Copy link
Member

this is consensus breaking, it could leave the network in a halt due to apphashes differing. we should do a small informational advisory

Copy link
Member

@tac0turtle tac0turtle left a comment

Choose a reason for hiding this comment

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

blocking merge to double check assumptions

@alexanderbez
Copy link
Contributor

blocking merge to double check assumptions

#19230 (comment)

@tac0turtle
Copy link
Member

should we close this pr?

@alexanderbez
Copy link
Contributor

we can close

@mergify mergify bot deleted the mergify/bp/release/v0.47.x/pr-19226 branch January 29, 2024 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 🥳 Done
Development

Successfully merging this pull request may close these issues.

3 participants