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 multisig LegacyAminoPubKey Amino marshaling (bp #8841) #8878

Merged
merged 4 commits into from
Mar 15, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 15, 2021

This is an automatic backport of pull request #8841 done by Mergify.

closes: #8776

Cherry-pick of d4d27e1 has failed:

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

You are currently cherry-picking commit d4d27e1c0.
  (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:
	new file:   crypto/keys/multisig/amino.go
	modified:   crypto/keys/multisig/codec.go
	modified:   crypto/keys/multisig/multisig_test.go
	modified:   x/auth/legacy/legacytx/stdtx.go
	modified:   x/genutil/legacy/v038/migrate.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/auth/legacy/v040/migrate.go

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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/

* Use v034auth RegisterCrypto

* Add custom amino for LegacyAminoPubKey

* Fix registercrypto

* Revert old PR

* revert some genutil stuff

* Add comment

* Add changelog

* Remove binary marshalling

* Fix lint

* Fix lint again

* Fix lint, 3rd time's a charm

* ignore wrong linter warning

* Fix UnmarshalAmioJSON

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Alessio Treglia <[email protected]>
Co-authored-by: Anil Kumar Kammari <[email protected]>
(cherry picked from commit d4d27e1)

# Conflicts:
#	CHANGELOG.md
#	x/auth/legacy/v040/migrate.go
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@orijbot
Copy link

orijbot commented Mar 15, 2021

@orijbot
Copy link

orijbot commented Mar 15, 2021

@alessio alessio merged commit 1e17860 into release/v0.42.x Mar 15, 2021
@alessio alessio deleted the mergify/bp/release/v0.42.x/pr-8841 branch March 15, 2021 16:52
@orijbot
Copy link

orijbot commented Mar 15, 2021

@orijbot
Copy link

orijbot commented Mar 15, 2021

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants