-
Notifications
You must be signed in to change notification settings - Fork 3.7k
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: Simulation is not deterministic due to GenSignedMockTx (backport #12374) #12403
fix: Simulation is not deterministic due to GenSignedMockTx (backport #12374) #12403
Conversation
@Muggle-Du do you think you could help address the merge conflicts here from backporting #12374? |
@Mergifyio rebase |
(cherry picked from commit 17dc431) # Conflicts: # CHANGELOG.md # simapp/helpers/test_helpers.go # simapp/test_helpers.go # x/authz/simulation/operations.go # x/bank/simulation/operations.go # x/genutil/gentx_test.go # x/gov/simulation/operations.go # x/group/simulation/operations.go # x/nft/simulation/operations.go # x/simulation/util.go # x/slashing/simulation/operations.go
✅ Branch has been successfully rebased |
c494b87
to
0295da5
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge conflicts need to be addressed :)
sorry for missing this msg, I can help with this |
I can do it otherwise, that's why I was assigned to the PR. |
This is an automatic backport of pull request #12374 done by Mergify.
Cherry-pick of 17dc431 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com