-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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 #23513
Conversation
📝 WalkthroughWalkthroughThe changes introduce new boolean fields Changes
Sequence DiagramsequenceDiagram
participant Client
participant Encoder
participant JSONMarshaler
Client->>Encoder: Encode with MarshalMappings=true
Encoder->>JSONMarshaler: jsonMarshal map
JSONMarshaler-->>Encoder: Marshaled map
Encoder-->>Client: Encoded result
Client->>Encoder: Encode with MarshalMappings=false
Encoder-->>Client: Error: Maps not supported
✨ Finishing Touches
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
Documentation and Community
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 0
🧹 Nitpick comments (2)
x/tx/signing/aminojson/json_marshal.go (2)
244-246
: Enhance map marshaling implementation.Consider the following improvements:
- Make the error message more descriptive when
marshalMappings
is false- Add validation for map key types to prevent JSON marshaling errors
- Consider type-specific handling for complex map values
if enc.marshalMappings { + // Validate that map keys can be marshaled to JSON strings + if keyKind := val.MapKey().Kind(); keyKind != protoreflect.StringKind && + !isNumericKind(keyKind) { + return fmt.Errorf("map keys of type %s cannot be marshaled to JSON", keyKind) + } return jsonMarshal(writer, value) } -return errors.New("maps are not supported") +return errors.New("map marshaling is disabled; enable with MarshalMappings option")Add this helper function:
func isNumericKind(kind protoreflect.Kind) bool { switch kind { case protoreflect.Int32Kind, protoreflect.Int64Kind, protoreflect.Uint32Kind, protoreflect.Uint64Kind, protoreflect.FloatKind, protoreflect.DoubleKind: return true } return false }
41-42
: Consider documenting performance implications and usage patterns.The map marshaling feature would benefit from:
- Documentation about performance implications for large maps
- Examples in the package documentation showing recommended usage patterns
- Guidelines for when to use this feature versus alternative approaches
Also applies to: 62-62, 99-99, 244-246
📜 Review details
Configuration used: .coderabbit.yml
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
x/tx/signing/aminojson/json_marshal.go
(4 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
x/tx/signing/aminojson/json_marshal.go (1)
Pattern **/*.go
: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.
⏰ Context from checks skipped due to timeout of 90000ms (3)
- GitHub Check: tests (00)
- GitHub Check: Analyze
- GitHub Check: Summary
🔇 Additional comments (3)
x/tx/signing/aminojson/json_marshal.go (3)
41-42
: LGTM! Well-documented option field.The
MarshalMappings
field is clearly named and properly documented, following Go conventions.
62-62
: LGTM! Well-structured internal field.The
marshalMappings
field follows Go conventions for internal fields and maintains consistency with other encoder fields.
99-99
: LGTM! Proper field initialization.The
marshalMappings
field is correctly initialized from the options struct.
Hey @johnletey do you mind sharing more about the use case of this feature as well as adding a test for this functionality? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK.
I can add a test and changelog in x/tx when I do the wiring for autocli 👍🏾
For context, AutoCLI doesn't support queries that have map field in them. AutoCLI uses the x/tx json marshaller, so when we need to extend feature, we extend those features in x/tx as an option. |
…#23539) Co-authored-by: Alex | Interchain Labs <[email protected]>
…#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
* main: (61 commits) build(deps): Bump cosmossdk.io/x/tx from 1.0.1 to 1.1.0 (#23547) feat(client/v2): add map support (#23544) fix(db): Fix pebbleDB integration (#23552) build(deps): Bump buf.build/gen/go/cometbft/cometbft/protocolbuffers/go from 1.36.3-20241120201313-68e42a58b301.1 to 1.36.4-20241120201313-68e42a58b301.1 in /api (#23520) build(deps): Bump github.com/golang/glog from 1.2.3 to 1.2.4 in /tools/hubl (#23541) fix(x/tx): add an option to encode maps using amino json (ref #23513) (#23539) build(deps): Bump cosmossdk.io/collections from 1.0.0 to 1.1.0 (#23534) build(deps): Bump github.com/bytedance/sonic from 1.12.7 to 1.12.8 in /log (#23516) chore: fix changelog for `v0.52.0-rc.2` (#23502) build(deps): Bump google.golang.org/protobuf from 1.36.3 to 1.36.4 in /x/upgrade (#23512) chore(collections): bring in `protocodec` in collections directly (#23515) feat(x/tx): add an option to encode maps using amino json (#23513) fix(codec): provide legacy amino og type (#23504) chore: remove unecessary SDKGasMeter impl (#23503) refactor: replace `golang.org/x/exp` with stdlib (#23501) build(deps): Bump google.golang.org/grpc from 1.69.4 to 1.70.0 in /tools/cosmovisor (#23496) build(deps): Bump google.golang.org/grpc from 1.69.4 to 1.70.0 in /store (#23494) build(deps): Bump github.com/hashicorp/go-plugin from 1.6.2 to 1.6.3 in /store (#23493) ci: Fix Ci job target (#23500) feat(server/v2): add swagger server component (#23486) ...
Description
Closes: #XXXX
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...
!
in the type prefix if API or client breaking changeCHANGELOG.md
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...
Summary by CodeRabbit