Merge branch 'main' into chore/changlog

Author: Alex | Interchain Labs

codec/depinject.go

@@ -51,8 +51,9 @@ func ProvideInterfaceRegistry(
 	return interfaceRegistry, interfaceRegistry, nil
 }
 
-func ProvideLegacyAmino() registry.AminoRegistrar {
-	return NewLegacyAmino()
+func ProvideLegacyAmino() (registry.AminoRegistrar, *LegacyAmino) {
+	amino := NewLegacyAmino()
+	return amino, amino
 }
 
 func ProvideProtoCodec(interfaceRegistry types.InterfaceRegistry) *ProtoCodec {

x/tx/signing/aminojson/json_marshal.go

@@ -38,6 +38,8 @@ type EncoderOptions struct {
 	// It is useful when using the Amino JSON encoder for non Amino purposes,
 	// such as JSON RPC.
 	AminoNameAsTypeURL bool
+	// MarshalMappings when set will use the Amino JSON encoder to marshal maps.
+	MarshalMappings bool
 	// TypeResolver is used to resolve protobuf message types by TypeURL when marshaling any packed messages.
 	TypeResolver signing.TypeResolver
 	// FileResolver is used to resolve protobuf file descriptors TypeURL when TypeResolver fails.
@@ -57,6 +59,7 @@ type Encoder struct {
 	indent                    string
 	enumsAsString             bool
 	aminoNameAsTypeURL        bool
+	marshalMappings           bool
 }
 
 // NewEncoder returns a new Encoder capable of serializing protobuf messages to JSON using the Amino JSON encoding
@@ -93,6 +96,7 @@ func NewEncoder(options EncoderOptions) Encoder {
 		indent:             options.Indent,
 		enumsAsString:      options.EnumAsString,
 		aminoNameAsTypeURL: options.AminoNameAsTypeURL,
+		marshalMappings:    options.MarshalMappings,
 	}
 	return enc
 }
@@ -237,6 +241,9 @@ func (enc Encoder) marshal(value protoreflect.Value, fd protoreflect.FieldDescri
 		return err
 
 	case protoreflect.Map:
+		if enc.marshalMappings {
+			return jsonMarshal(writer, value)
+		}
 		return errors.New("maps are not supported")
 
 	case protoreflect.List: