feat(x/tx): sync with upstream (#836)

* reset to upstream

* feat(x/tx): support bytes field as signer (cosmos#21850)

(cherry picked from commit dbf6cdb)

* fix(x/tx): fix amino json drift from legacy spec (cosmos#21825)

(cherry picked from commit 2d40cc1)

fix half conflicts and revert tests

conflicts

* changelog

go.mod

@@ -11,7 +11,7 @@ require (
 	cosmossdk.io/log v1.4.1
 	cosmossdk.io/math v1.3.0
 	cosmossdk.io/store v1.1.1
-	cosmossdk.io/x/tx v0.13.5
+	cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871
 	github.com/99designs/keyring v1.2.1
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816
 	github.com/bits-and-blooms/bitset v1.8.0

go.sum

@@ -10,8 +10,8 @@ cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
 cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
 cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
 cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
-cosmossdk.io/x/tx v0.13.5 h1:FdnU+MdmFWn1pTsbfU0OCf2u6mJ8cqc1H4OMG418MLw=
-cosmossdk.io/x/tx v0.13.5/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
+cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871 h1:+lRwWQRVvB3jgRgdqrgeFUJ45BoXZh/UeeAV5f/m2Gk=
+cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=

simapp/go.mod

@@ -16,7 +16,7 @@ require (
 	cosmossdk.io/x/evidence v0.1.1
 	cosmossdk.io/x/feegrant v0.1.1
 	cosmossdk.io/x/nft v0.1.1
-	cosmossdk.io/x/tx v0.13.5
+	cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871
 	cosmossdk.io/x/upgrade v0.1.4
 	github.com/cometbft/cometbft v0.38.12
 	github.com/cosmos/cosmos-db v1.0.2

simapp/go.sum

@@ -204,8 +204,8 @@ cosmossdk.io/x/feegrant v0.1.1 h1:EKFWOeo/pup0yF0svDisWWKAA9Zags6Zd0P3nRvVvw8=
 cosmossdk.io/x/feegrant v0.1.1/go.mod h1:2GjVVxX6G2fta8LWj7pC/ytHjryA6MHAJroBWHFNiEQ=
 cosmossdk.io/x/nft v0.1.1 h1:pslAVS8P5NkW080+LWOamInjDcq+v2GSCo+BjN9sxZ8=
 cosmossdk.io/x/nft v0.1.1/go.mod h1:Kac6F6y2gsKvoxU+fy8uvxRTi4BIhLOor2zgCNQwVgY=
-cosmossdk.io/x/tx v0.13.5 h1:FdnU+MdmFWn1pTsbfU0OCf2u6mJ8cqc1H4OMG418MLw=
-cosmossdk.io/x/tx v0.13.5/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
+cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871 h1:+lRwWQRVvB3jgRgdqrgeFUJ45BoXZh/UeeAV5f/m2Gk=
+cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
 cosmossdk.io/x/upgrade v0.1.4 h1:/BWJim24QHoXde8Bc64/2BSEB6W4eTydq0X/2f8+g38=
 cosmossdk.io/x/upgrade v0.1.4/go.mod h1:9v0Aj+fs97O+Ztw+tG3/tp5JSlrmT7IcFhAebQHmOPo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=

tests/go.mod

@@ -14,7 +14,7 @@ require (
 	cosmossdk.io/x/evidence v0.1.1
 	cosmossdk.io/x/feegrant v0.1.1
 	cosmossdk.io/x/nft v0.1.1 // indirect
-	cosmossdk.io/x/tx v0.13.5
+	cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871
 	cosmossdk.io/x/upgrade v0.1.4
 	github.com/cometbft/cometbft v0.38.12
 	github.com/cosmos/cosmos-db v1.0.2

tests/go.sum

@@ -206,8 +206,8 @@ cosmossdk.io/x/feegrant v0.1.1 h1:EKFWOeo/pup0yF0svDisWWKAA9Zags6Zd0P3nRvVvw8=
 cosmossdk.io/x/feegrant v0.1.1/go.mod h1:2GjVVxX6G2fta8LWj7pC/ytHjryA6MHAJroBWHFNiEQ=
 cosmossdk.io/x/nft v0.1.1 h1:pslAVS8P5NkW080+LWOamInjDcq+v2GSCo+BjN9sxZ8=
 cosmossdk.io/x/nft v0.1.1/go.mod h1:Kac6F6y2gsKvoxU+fy8uvxRTi4BIhLOor2zgCNQwVgY=
-cosmossdk.io/x/tx v0.13.5 h1:FdnU+MdmFWn1pTsbfU0OCf2u6mJ8cqc1H4OMG418MLw=
-cosmossdk.io/x/tx v0.13.5/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
+cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871 h1:+lRwWQRVvB3jgRgdqrgeFUJ45BoXZh/UeeAV5f/m2Gk=
+cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
 cosmossdk.io/x/upgrade v0.1.4 h1:/BWJim24QHoXde8Bc64/2BSEB6W4eTydq0X/2f8+g38=
 cosmossdk.io/x/upgrade v0.1.4/go.mod h1:9v0Aj+fs97O+Ztw+tG3/tp5JSlrmT7IcFhAebQHmOPo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=

x/tx/CHANGELOG.md

@@ -31,13 +31,18 @@ Since v0.13.0, x/tx follows Cosmos SDK semver: https://github.com/cosmos/cosmos-
 
 # Changelog
 
-## [Unreleased-Upstream]
+## [Unreleased]
 
 ### Improvements
 
-* [#276](https://github.com/crypto-org-chain/cosmos-sdk/pull/276) Support bytes in automatic signer getters.
+* [#21850](https://github.com/cosmos/cosmos-sdk/pull/21850) Support bytes field as signer.
 
-## [Unreleased]
+## [v0.13.6](https://github.com/cosmos/cosmos-sdk/releases/tag/x/tx/v0.13.6) - 2024-10-XX
+
+### Bug Fixes
+
+* [#21782](https://github.com/cosmos/cosmos-sdk/pull/21782) Fix JSON attribute sort order on messages with oneof fields.
+* [#21825](https://github.com/cosmos/cosmos-sdk/pull/21825) Fix decimal encoding and field ordering in Amino JSON encoder.
 
 ## [v0.13.5](https://github.com/cosmos/cosmos-sdk/releases/tag/x/tx/v0.13.5) - 2024-09-18
 

x/tx/signing/aminojson/encoder.go

@@ -51,7 +51,12 @@ func cosmosDecEncoder(_ *Encoder, v protoreflect.Value, w io.Writer) error {
 		if val == "" {
 			return jsonMarshal(w, "0")
 		}
-		return jsonMarshal(w, val)
+		var dec math.LegacyDec
+		err := dec.Unmarshal([]byte(val))
+		if err != nil {
+			return err
+		}
+		return jsonMarshal(w, dec.String())
 	case []byte:
 		if len(val) == 0 {
 			return jsonMarshal(w, "0")
@@ -125,27 +130,40 @@ func keyFieldEncoder(_ *Encoder, msg protoreflect.Message, w io.Writer) error {
 }
 
 type moduleAccountPretty struct {
-	Address       string   `json:"address"`
-	PubKey        string   `json:"public_key"`
 	AccountNumber uint64   `json:"account_number"`
-	Sequence      uint64   `json:"sequence"`
+	Address       string   `json:"address"`
 	Name          string   `json:"name"`
 	Permissions   []string `json:"permissions"`
+	PubKey        string   `json:"public_key"`
+	Sequence      uint64   `json:"sequence"`
 }
 
 // moduleAccountEncoder replicates the behavior in
 // https://github.com/cosmos/cosmos-sdk/blob/41a3dfeced2953beba3a7d11ec798d17ee19f506/x/auth/types/account.go#L230-L254
 func moduleAccountEncoder(_ *Encoder, msg protoreflect.Message, w io.Writer) error {
-	ma := msg.Interface().(*authapi.ModuleAccount)
+	ma := &authapi.ModuleAccount{}
+	msgDesc := msg.Descriptor()
+	if msgDesc.FullName() != ma.ProtoReflect().Descriptor().FullName() {
+		return errors.New("moduleAccountEncoder: msg not a auth.ModuleAccount")
+	}
+	fields := msgDesc.Fields()
+
 	pretty := moduleAccountPretty{
-		PubKey:      "",
-		Name:        ma.Name,
-		Permissions: ma.Permissions,
-	}
-	if ma.BaseAccount != nil {
-		pretty.Address = ma.BaseAccount.Address
-		pretty.AccountNumber = ma.BaseAccount.AccountNumber
-		pretty.Sequence = ma.BaseAccount.Sequence
+		PubKey: "",
+		Name:   msg.Get(fields.ByName("name")).String(),
+	}
+	permissions := msg.Get(fields.ByName("permissions")).List()
+	for i := 0; i < permissions.Len(); i++ {
+		pretty.Permissions = append(pretty.Permissions, permissions.Get(i).String())
+	}
+
+	if msg.Has(fields.ByName("base_account")) {
+		baseAccount := msg.Get(fields.ByName("base_account"))
+		baMsg := baseAccount.Message()
+		bamdFields := baMsg.Descriptor().Fields()
+		pretty.Address = baMsg.Get(bamdFields.ByName("address")).String()
+		pretty.AccountNumber = baMsg.Get(bamdFields.ByName("account_number")).Uint()
+		pretty.Sequence = baMsg.Get(bamdFields.ByName("sequence")).Uint()
 	} else {
 		pretty.Address = ""
 		pretty.AccountNumber = 0

x/tx/signing/aminojson/json_marshal.go

@@ -268,8 +268,11 @@ func (enc Encoder) marshal(value protoreflect.Value, fd protoreflect.FieldDescri
 }
 
 type nameAndIndex struct {
-	i    int
-	name string
+	i              int
+	name           string
+	oneof          protoreflect.OneofDescriptor
+	oneofFieldName string
+	oneofTypeName  string
 }
 
 func (enc Encoder) marshalMessage(msg protoreflect.Message, writer io.Writer) error {
@@ -300,14 +303,37 @@ func (enc Encoder) marshalMessage(msg protoreflect.Message, writer io.Writer) er
 	indices := make([]*nameAndIndex, 0, fields.Len())
 	for i := 0; i < fields.Len(); i++ {
 		f := fields.Get(i)
-		name := getAminoFieldName(f)
-		indices = append(indices, &nameAndIndex{i: i, name: name})
+		entry := &nameAndIndex{
+			i:     i,
+			name:  getAminoFieldName(f),
+			oneof: f.ContainingOneof(),
+		}
+
+		if entry.oneof != nil {
+			var err error
+			entry.oneofFieldName, entry.oneofTypeName, err = getOneOfNames(f)
+			if err != nil {
+				return err
+			}
+		}
+
+		indices = append(indices, entry)
 	}
 
 	if shouldSortFields := !enc.doNotSortFields; shouldSortFields {
 		sort.Slice(indices, func(i, j int) bool {
 			ni, nj := indices[i], indices[j]
-			return ni.name < nj.name
+			niName, njName := ni.name, nj.name
+
+			if indices[i].oneof != nil {
+				niName = indices[i].oneofFieldName
+			}
+
+			if indices[j].oneof != nil {
+				njName = indices[j].oneofFieldName
+			}
+
+			return niName < njName
 		})
 	}
 
@@ -316,22 +342,17 @@ func (enc Encoder) marshalMessage(msg protoreflect.Message, writer io.Writer) er
 		name := ni.name
 		f := fields.Get(i)
 		v := msg.Get(f)
-		oneof := f.ContainingOneof()
-		isOneOf := oneof != nil
-		oneofFieldName, oneofTypeName, err := getOneOfNames(f)
-		if err != nil && isOneOf {
-			return err
-		}
+		isOneOf := ni.oneof != nil
 		writeNil := false
 
 		if !msg.Has(f) {
 			// msg.WhichOneof(oneof) == nil: no field of the oneof has been set
 			// !emptyOneOfWritten: we haven't written a null for this oneof yet (only write one null per empty oneof)
 			switch {
-			case isOneOf && msg.WhichOneof(oneof) == nil && !emptyOneOfWritten[oneofFieldName]:
-				name = oneofFieldName
+			case isOneOf && msg.WhichOneof(ni.oneof) == nil && !emptyOneOfWritten[ni.oneofFieldName]:
+				name = ni.oneofFieldName
 				writeNil = true
-				emptyOneOfWritten[oneofFieldName] = true
+				emptyOneOfWritten[ni.oneofFieldName] = true
 			case omitEmpty(f):
 				continue
 			case f.Kind() == protoreflect.MessageKind &&
@@ -349,7 +370,7 @@ func (enc Encoder) marshalMessage(msg protoreflect.Message, writer io.Writer) er
 		}
 
 		if isOneOf && !writeNil {
-			_, err = fmt.Fprintf(writer, `"%s":{"type":"%s","value":{`, oneofFieldName, oneofTypeName)
+			_, err = fmt.Fprintf(writer, `"%s":{"type":"%s","value":{`, ni.oneofFieldName, ni.oneofTypeName)
 			if err != nil {
 				return err
 			}

x/tx/signing/context.go

@@ -249,6 +249,7 @@ func (c *Context) makeGetSignersFunc(descriptor protoreflect.MessageDescriptor)
 						}
 						return arr, nil
 					}
+
 					return fieldGetter(msg.Get(childField).Message(), depth+1)
 				case childField.IsMap() || childField.HasOptionalKeyword():
 					return nil, fmt.Errorf("cosmos.msg.v1.signer field %s in message %s must not be a map or optional", signerFieldName, desc.FullName())
@@ -268,6 +269,7 @@ func (c *Context) makeGetSignersFunc(descriptor protoreflect.MessageDescriptor)
 						}
 						return res, nil
 					}
+
 					addrStr := msg.Get(childField).String()
 					addrBz, err := addrCdc.StringToBytes(addrStr)
 					if err != nil {