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

feat: update the slashing and evidence modules to work with ICS (backport #15908) #15947

Merged
merged 2 commits into from
Apr 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 25, 2023

This is an automatic backport of pull request #15908 done by Mergify.
Cherry-pick of 97e4978 has failed:

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

You are currently cherry-picking commit 97e4978f0.
  (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/slashing/keeper/infractions.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/evidence/keeper/infraction.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

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Jacob Gadikian <faddat@users.noreply.github.com>
(cherry picked from commit 97e4978)

# Conflicts:
#	CHANGELOG.md
#	x/evidence/keeper/infraction.go
@mergify mergify bot requested a review from a team as a code owner April 25, 2023 16:37
@mergify mergify bot added the conflicts label Apr 25, 2023
@julienrbrt julienrbrt self-assigned this Apr 25, 2023
@julienrbrt julienrbrt removed their assignment Apr 25, 2023
@julienrbrt julienrbrt requested a review from sainoe April 25, 2023 17:27
@julienrbrt julienrbrt merged commit 6b30073 into release/v0.47.x Apr 25, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-15908 branch April 25, 2023 20:28
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

3 participants