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: adding checks to ensure coin denoms are sorted in Balance during Validate (backport #9829) #10849

Merged
merged 8 commits into from
Jan 3, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 28, 2021

This is an automatic backport of pull request #9829 done by Mergify.
Cherry-pick of 2cea5e5 has failed:

On branch mergify/bp/release/v0.45.x/pr-9829
Your branch is ahead of 'origin/release/v0.45.x' by 1 commit.
  (use "git push" to publish your local commits)

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

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

Cherry-pick of 59b788a has failed:

On branch mergify/bp/release/v0.45.x/pr-9829
Your branch is ahead of 'origin/release/v0.45.x' by 5 commits.
  (use "git push" to publish your local commits)

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

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

(cherry picked from commit 2cea5e5)

# Conflicts:
#	CHANGELOG.md
(cherry picked from commit 40d22c7)
(cherry picked from commit 2468b64)
(cherry picked from commit 66b91ee)
(cherry picked from commit 59b788a)

# Conflicts:
#	CHANGELOG.md
@amaury1093 amaury1093 merged commit 19e924d into release/v0.45.x Jan 3, 2022
@amaury1093 amaury1093 deleted the mergify/bp/release/v0.45.x/pr-9829 branch January 3, 2022 14:01
@faddat faddat mentioned this pull request Feb 28, 2022
8 tasks
zakir-code pushed a commit to FunctionX/cosmos-sdk that referenced this pull request Apr 8, 2022
…ng `Validate` (backport cosmos#9829) (cosmos#10849)

* adding checks to ensure denoms are sorted

(cherry picked from commit ce1e650)

* updating changelog

(cherry picked from commit 2cea5e5)

# Conflicts:
#	CHANGELOG.md

* refactoring balance.coin validation

(cherry picked from commit 40d22c7)

* adding 0 value coin test case

(cherry picked from commit 2468b64)

* added valid sorted coin testcase

(cherry picked from commit 66b91ee)

* updating changelog

(cherry picked from commit 59b788a)

# Conflicts:
#	CHANGELOG.md

* conflicts

Co-authored-by: Spoorthi <9302666+spoo-bar@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>
JimLarson pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Jul 7, 2022
…ng `Validate` (backport cosmos#9829) (cosmos#10849)

* adding checks to ensure denoms are sorted

(cherry picked from commit ce1e650)

* updating changelog

(cherry picked from commit 2cea5e5)

# Conflicts:
#	CHANGELOG.md

* refactoring balance.coin validation

(cherry picked from commit 40d22c7)

* adding 0 value coin test case

(cherry picked from commit 2468b64)

* added valid sorted coin testcase

(cherry picked from commit 66b91ee)

* updating changelog

(cherry picked from commit 59b788a)

# Conflicts:
#	CHANGELOG.md

* conflicts

Co-authored-by: Spoorthi <9302666+spoo-bar@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>
Eengineer1 pushed a commit to cheqd/cosmos-sdk that referenced this pull request Aug 26, 2022
…ng `Validate` (backport cosmos#9829) (cosmos#10849)

* adding checks to ensure denoms are sorted

(cherry picked from commit ce1e650)

* updating changelog

(cherry picked from commit 2cea5e5)

# Conflicts:
#	CHANGELOG.md

* refactoring balance.coin validation

(cherry picked from commit 40d22c7)

* adding 0 value coin test case

(cherry picked from commit 2468b64)

* added valid sorted coin testcase

(cherry picked from commit 66b91ee)

* updating changelog

(cherry picked from commit 59b788a)

# Conflicts:
#	CHANGELOG.md

* conflicts

Co-authored-by: Spoorthi <9302666+spoo-bar@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants