fix: deterministic protov2 marshal (backport #18403) (#18406)

Co-authored-by: Julien Robert <julien@rbrt.fr>

codec/collections.go

@@ -104,7 +104,8 @@ type collValue2[T any, PT protoMessageV2[T]] struct {
 }
 
 func (c collValue2[T, PT]) Encode(value PT) ([]byte, error) {
-	return protov2.Marshal(value)
+	protov2MarshalOpts := protov2.MarshalOptions{Deterministic: true}
+	return protov2MarshalOpts.Marshal(value)
 }
 
 func (c collValue2[T, PT]) Decode(b []byte) (PT, error) {

codec/proto_codec.go

@@ -345,7 +345,8 @@ type grpcProtoCodec struct {
 func (g grpcProtoCodec) Marshal(v interface{}) ([]byte, error) {
 	switch m := v.(type) {
 	case proto.Message:
-		return proto.Marshal(m)
+		protov2MarshalOpts := proto.MarshalOptions{Deterministic: true}
+		return protov2MarshalOpts.Marshal(m)
 	case gogoproto.Message:
 		return g.cdc.Marshal(m)
 	default:

codec/types/any.go

@@ -69,7 +69,8 @@ func NewAnyWithValue(v proto.Message) (*Any, error) {
 		err error
 	)
 	if msg, ok := v.(protov2.Message); ok {
-		bz, err = protov2.Marshal(msg)
+		protov2MarshalOpts := protov2.MarshalOptions{Deterministic: true}
+		bz, err = protov2MarshalOpts.Marshal(msg)
 	} else {
 		bz, err = proto.Marshal(v)
 	}
@@ -110,7 +111,8 @@ func (any *Any) pack(x proto.Message) error {
 		err error
 	)
 	if msg, ok := x.(protov2.Message); ok {
-		bz, err = protov2.Marshal(msg)
+		protov2MarshalOpts := protov2.MarshalOptions{Deterministic: true}
+		bz, err = protov2MarshalOpts.Marshal(msg)
 	} else {
 		bz, err = proto.Marshal(x)
 	}