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 #8841

Merged
merged 21 commits into from
Mar 15, 2021
Merged

Conversation

amaury1093
Copy link
Contributor

@amaury1093 amaury1093 commented Mar 10, 2021

Description

revert: #8794 (that was a temporary workaround)
closes: #8776

PR description in crypto/keys/multisig/amino.go comments

To test, I did:


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the module structure standards.
  • Wrote unit and integration tests
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added relevant godoc comments.
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer
  • Review Codecov Report in the comment section below once CI passes

@amaury1093 amaury1093 marked this pull request as ready for review March 10, 2021 14:21
@amaury1093 amaury1093 marked this pull request as draft March 10, 2021 14:22
@amaury1093 amaury1093 marked this pull request as ready for review March 10, 2021 14:40
@amaury1093
Copy link
Contributor Author

Would love to have @anilcse or @akhilkumarpilli try this manually.

Copy link
Contributor

@akhilkumarpilli akhilkumarpilli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested ACK. Thanks @AmauryM

@alessio alessio added the A:automerge Automatically merge PR once all prerequisites pass. label Mar 11, 2021
@alessio
Copy link
Contributor

alessio commented Mar 11, 2021

Tests are failing

@orijbot
Copy link

orijbot commented Mar 12, 2021

@orijbot
Copy link

orijbot commented Mar 12, 2021

@orijbot
Copy link

orijbot commented Mar 14, 2021

@orijbot
Copy link

orijbot commented Mar 15, 2021

@orijbot
Copy link

orijbot commented Mar 15, 2021

@orijbot
Copy link

orijbot commented Mar 15, 2021

@codecov
Copy link

codecov bot commented Mar 15, 2021

Codecov Report

Merging #8841 (f46993f) into master (c6af0ed) will increase coverage by 0.01%.
The diff coverage is 70.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8841      +/-   ##
==========================================
+ Coverage   59.15%   59.17%   +0.01%     
==========================================
  Files         570      571       +1     
  Lines       31770    31800      +30     
==========================================
+ Hits        18793    18817      +24     
- Misses      10776    10780       +4     
- Partials     2201     2203       +2     
Impacted Files Coverage Δ
crypto/keys/multisig/codec.go 100.00% <ø> (ø)
server/test_helpers.go 0.00% <0.00%> (ø)
crypto/keys/multisig/amino.go 70.37% <70.37%> (ø)
x/auth/client/cli/tx_multisign.go 64.88% <71.42%> (+0.04%) ⬆️
x/auth/client/cli/tx_sign.go 74.59% <100.00%> (ø)
x/auth/legacy/legacytx/stdtx.go 80.85% <100.00%> (ø)
x/auth/legacy/v040/migrate.go 90.16% <100.00%> (+2.86%) ⬆️
x/genutil/legacy/v038/migrate.go 82.75% <100.00%> (+0.61%) ⬆️

@mergify mergify bot merged commit d4d27e1 into master Mar 15, 2021
@mergify mergify bot deleted the am/multisig-import branch March 15, 2021 12:42
@orijbot
Copy link

orijbot commented Mar 15, 2021

@orijbot
Copy link

orijbot commented Mar 15, 2021

mergify bot pushed a commit that referenced this pull request Mar 15, 2021
* 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 <alessio@tendermint.com>
Co-authored-by: Anil Kumar Kammari <anil@vitwit.com>
(cherry picked from commit d4d27e1)

# Conflicts:
#	CHANGELOG.md
#	x/auth/legacy/v040/migrate.go
alessio pushed a commit that referenced this pull request Mar 15, 2021
(cherry picked from commit d4d27e1)

closes: #8776

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
Co-authored-by: Alessio Treglia <alessio@tendermint.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Anil Kumar Kammari <anil@vitwit.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass. C:Crypto C:Encoding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

migrate command failed with error cannot unmarshal string into Go value of type uint32
6 participants