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

feat(x/tx): add an option to encode maps using amino json (backport #23539) #23540

Merged
merged 3 commits into from
Jan 28, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 28, 2025

Follow-up of #23513

Afterwards i'll cherry-pick this in x/tx v0.13 after Noble's request. v0.13 is present in release/v0.50.x branch, hence the backport to that branch. v1 is tagged from main.
Then I'll bump in autocli.


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title, you can find examples of the prefixes below:

  • confirmed ! in the type prefix if API or client breaking change

  • targeted the correct branch (see PR Targeting)

  • provided a link to the relevant issue or specification

  • reviewed "Files changed" and left comments if necessary

  • included the necessary unit and integration tests

  • added a changelog entry to CHANGELOG.md

  • updated the relevant documentation or specification, including comments for documenting Go code

  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

Please see Pull Request Reviewer section in the contributing guide for more information on how to review a pull request.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage

Summary by CodeRabbit

Release Notes

  • New Features

    • Added map marshalling support to the Amino JSON encoder
    • Improved handling of map and list types during JSON marshaling
  • Testing

    • Enhanced test coverage for map marshalling functionality
    • Removed debugging print statements from existing tests
  • Changelog

    • Updated changelog with new versions v1.1.0 and v0.13.7

These updates improve the robustness and flexibility of the JSON encoding process, particularly for map and list data types.


This is an automatic backport of pull request #23539 done by [Mergify](https://mergify.com).

…#23539)

Co-authored-by: Alex | Interchain Labs <[email protected]>
(cherry picked from commit aef1a2a)

# Conflicts:
#	x/tx/CHANGELOG.md
#	x/tx/signing/aminojson/json_marshal.go
#	x/tx/signing/aminojson/json_marshal_test.go
Copy link
Contributor Author

mergify bot commented Jan 28, 2025

Cherry-pick of aef1a2a has failed:

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

You are currently cherry-picking commit aef1a2a06.
  (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:   x/tx/CHANGELOG.md
	both modified:   x/tx/signing/aminojson/json_marshal.go
	both modified:   x/tx/signing/aminojson/json_marshal_test.go

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jan 28, 2025
@mergify mergify bot requested a review from a team as a code owner January 28, 2025 17:22
@julienrbrt julienrbrt self-assigned this Jan 28, 2025
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

I'll fix this

@julienrbrt julienrbrt changed the title fix(x/tx): add an option to encode maps using amino json (ref #23513) (backport #23539) feat(x/tx): add an option to encode maps using amino json (backport #23539) Jan 28, 2025
@julienrbrt julienrbrt enabled auto-merge (squash) January 28, 2025 20:01
@julienrbrt julienrbrt disabled auto-merge January 28, 2025 20:09
@julienrbrt julienrbrt merged commit f1b139d into release/v0.50.x Jan 28, 2025
48 of 49 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-23539 branch January 28, 2025 20:09
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.

1 participant