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: allow non-EOA accounts to stake in simulation (backport #16068) #16130

Merged
merged 2 commits into from
May 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 12, 2023

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

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

You are currently cherry-picking commit ddf51ccdd.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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: Marko <marbar3778@yahoo.com>
(cherry picked from commit ddf51cc)

# Conflicts:
#	CHANGELOG.md
#	x/staking/simulation/operations.go
@tac0turtle tac0turtle merged commit e0866fe into release/v0.47.x May 12, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.47.x/pr-16068 branch May 12, 2023 14:37
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
…6068) (cosmos#16130)

Co-authored-by: Javier Su <javier.su.weijie@gmail.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
kakysha pushed a commit to InjectiveLabs/cosmos-sdk that referenced this pull request Aug 15, 2023
…6068) (cosmos#16130)

Co-authored-by: Javier Su <javier.su.weijie@gmail.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
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