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: unmarshalling issue with multisig keys in master (backport #10061) #10169

Merged
merged 2 commits into from
Sep 16, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 16, 2021

This is an automatic backport of pull request #10061 done by Mergify.
Cherry-pick of 3d3bc7c has failed:

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

You are currently cherry-picking commit 3d3bc7c43.
  (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:   crypto/keys/multisig/amino.go
	modified:   crypto/keys/multisig/multisig_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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.io/

(cherry picked from commit 3d3bc7c)

# Conflicts:
#	CHANGELOG.md
@orijbot
Copy link

orijbot commented Sep 16, 2021

@blushi blushi self-assigned this Sep 16, 2021
@robert-zaremba robert-zaremba merged commit fcaff72 into release/v0.44.x Sep 16, 2021
@robert-zaremba robert-zaremba deleted the mergify/bp/release/v0.44.x/pr-10061 branch September 16, 2021 18:42
robert-zaremba added a commit that referenced this pull request Sep 18, 2021
* Revert "fix: unmarshalling issue with multisig keys in master (backport #10061) (#10169)"

This reverts commit fcaff72.

* Update CHANGELOG.md

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
tomtau added a commit to crypto-org-chain/cosmos-sdk that referenced this pull request Sep 21, 2021
…10193)

* Revert "fix: unmarshalling issue with multisig keys in master (backport cosmos#10061) (cosmos#10169)"

This reverts commit fcaff72.

* Update CHANGELOG.md

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
@amaury1093 amaury1093 added this to the v0.44.1 milestone Sep 29, 2021
evan-forbes pushed a commit to evan-forbes/cosmos-sdk that referenced this pull request Oct 12, 2021
…s#10061) (cosmos#10169)

* fix: unmarshalling issue with multisig keys in master (cosmos#10061)

(cherry picked from commit 3d3bc7c)

# Conflicts:
#	CHANGELOG.md

* fix conflicts

Co-authored-by: Henrik Aasted Sørensen <has@bitcraft.dk>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
evan-forbes pushed a commit to evan-forbes/cosmos-sdk that referenced this pull request Oct 12, 2021
…10193)

* Revert "fix: unmarshalling issue with multisig keys in master (backport cosmos#10061) (cosmos#10169)"

This reverts commit fcaff72.

* Update CHANGELOG.md

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
evan-forbes pushed a commit to evan-forbes/cosmos-sdk that referenced this pull request Nov 1, 2021
…s#10061) (cosmos#10169)

* fix: unmarshalling issue with multisig keys in master (cosmos#10061)

(cherry picked from commit 3d3bc7c)

# Conflicts:
#	CHANGELOG.md

* fix conflicts

Co-authored-by: Henrik Aasted Sørensen <has@bitcraft.dk>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
evan-forbes pushed a commit to evan-forbes/cosmos-sdk that referenced this pull request Nov 1, 2021
…10193)

* Revert "fix: unmarshalling issue with multisig keys in master (backport cosmos#10061) (cosmos#10169)"

This reverts commit fcaff72.

* Update CHANGELOG.md

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
Eengineer1 pushed a commit to cheqd/cosmos-sdk that referenced this pull request Aug 26, 2022
…s#10061) (cosmos#10169)

* fix: unmarshalling issue with multisig keys in master (cosmos#10061)

(cherry picked from commit 3d3bc7c)

* fix conflicts

Co-authored-by: Henrik Aasted Sørensen <has@bitcraft.dk>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
Eengineer1 pushed a commit to cheqd/cosmos-sdk that referenced this pull request Aug 26, 2022
…10193)

* Revert "fix: unmarshalling issue with multisig keys in master (backport cosmos#10061) (cosmos#10169)"

This reverts commit fcaff72.

* Update CHANGELOG.md

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
…s#10061) (cosmos#10169)

* fix: unmarshalling issue with multisig keys in master (cosmos#10061)

(cherry picked from commit 3d3bc7c)

# Conflicts:
#	CHANGELOG.md

* fix conflicts

Co-authored-by: Henrik Aasted Sørensen <has@bitcraft.dk>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
…10193)

* Revert "fix: unmarshalling issue with multisig keys in master (backport cosmos#10061) (cosmos#10169)"

This reverts commit fcaff72.

* Update CHANGELOG.md

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants