Skip to content

Commit

Permalink
fix(client/v2): *big.Int unmarshal (#21853)
Browse files Browse the repository at this point in the history
  • Loading branch information
julienrbrt authored Oct 8, 2024
1 parent 5fea67d commit 43c41be
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 8 deletions.
4 changes: 4 additions & 0 deletions client/v2/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ Ref: https://keepachangelog.com/en/1.0.0/

* [#17709](https://github.com/cosmos/cosmos-sdk/pull/17709) Address codecs have been removed from `autocli.AppOptions` and `flag.Builder`. Instead client/v2 uses the address codecs present in the context (introduced in [#17503](https://github.com/cosmos/cosmos-sdk/pull/17503)).

### Bug Fixes

* [#21853](https://github.com/cosmos/cosmos-sdk/pull/21853) Fix `*big.Int` unmarshalling in txs.

## [v2.0.0-beta.5] - 2024-09-18

### Improvements
Expand Down
2 changes: 2 additions & 0 deletions client/v2/autocli/flag/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const (
ValidatorAddressStringScalarType = "cosmos.ValidatorAddressString"
ConsensusAddressStringScalarType = "cosmos.ConsensusAddressString"
PubkeyScalarType = "cosmos.Pubkey"
DecScalarType = "cosmos.Dec"
)

// Builder manages options for building pflag flags for protobuf messages.
Expand Down Expand Up @@ -67,6 +68,7 @@ func (b *Builder) init() {
b.scalarFlagTypes[ValidatorAddressStringScalarType] = validatorAddressStringType{}
b.scalarFlagTypes[ConsensusAddressStringScalarType] = consensusAddressStringType{}
b.scalarFlagTypes[PubkeyScalarType] = pubkeyType{}
b.scalarFlagTypes[DecScalarType] = decType{}
}
}

Expand Down
48 changes: 48 additions & 0 deletions client/v2/autocli/flag/legacy_dec.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package flag

import (
"context"

"google.golang.org/protobuf/reflect/protoreflect"

"cosmossdk.io/math"
)

type decType struct{}

func (a decType) NewValue(_ *context.Context, _ *Builder) Value {
return &decValue{}
}

func (a decType) DefaultValue() string {
return "0"
}

type decValue struct {
value string
}

func (a decValue) Get(protoreflect.Value) (protoreflect.Value, error) {
return protoreflect.ValueOf(a.value), nil
}

func (a decValue) String() string {
return a.value
}

func (a *decValue) Set(s string) error {
dec, err := math.LegacyNewDecFromStr(s)
if err != nil {
return err
}

// we need to convert from float representation to non-float representation using default precision
// 0.5 -> 500000000000000000
a.value = dec.BigInt().String()

return nil
}

func (a decValue) Type() string {
return "cosmos.Dec"
}
10 changes: 5 additions & 5 deletions x/auth/tx/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ var marshalOption = proto.MarshalOptions{
func (w *builder) getTx() (*gogoTxWrapper, error) {
anyMsgs, err := msgsV1toAnyV2(w.msgs)
if err != nil {
return nil, err
return nil, fmt.Errorf("unable to convert messages: %w", err)
}
body := &txv1beta1.TxBody{
Messages: anyMsgs,
Expand All @@ -136,12 +136,12 @@ func (w *builder) getTx() (*gogoTxWrapper, error) {

bodyBytes, err := marshalOption.Marshal(body)
if err != nil {
return nil, err
return nil, fmt.Errorf("unable to marshal body: %w", err)
}

authInfoBytes, err := marshalOption.Marshal(authInfo)
if err != nil {
return nil, err
return nil, fmt.Errorf("unable to marshal auth info: %w", err)
}

txRawBytes, err := marshalOption.Marshal(&txv1beta1.TxRaw{
Expand All @@ -150,12 +150,12 @@ func (w *builder) getTx() (*gogoTxWrapper, error) {
Signatures: w.signatures,
})
if err != nil {
return nil, err
return nil, fmt.Errorf("unable to marshal tx raw: %w", err)
}

decodedTx, err := w.decoder.Decode(txRawBytes)
if err != nil {
return nil, err
return nil, fmt.Errorf("unable to decode tx: %w", err)
}

return newWrapperFromDecodedTx(w.addressCodec, w.codec, decodedTx)
Expand Down
6 changes: 3 additions & 3 deletions x/tx/decode/decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (d *Decoder) Decode(txBytes []byte) (*DecodedTx, error) {

err = proto.Unmarshal(txBytes, &raw)
if err != nil {
return nil, err
return nil, errorsmod.Wrap(ErrTxDecode, err.Error())
}

var body v1beta1.TxBody
Expand Down Expand Up @@ -136,7 +136,7 @@ func (d *Decoder) Decode(txBytes []byte) (*DecodedTx, error) {
dynamicMsg := dynamicpb.NewMessageType(msgDesc.(protoreflect.MessageDescriptor)).New().Interface()
err = anyMsg.UnmarshalTo(dynamicMsg)
if err != nil {
return nil, err
return nil, errorsmod.Wrap(ErrTxDecode, fmt.Sprintf("cannot unmarshal Any message: %v", err))
}
dynamicMsgs = append(dynamicMsgs, dynamicMsg)

Expand All @@ -148,7 +148,7 @@ func (d *Decoder) Decode(txBytes []byte) (*DecodedTx, error) {
msg := reflect.New(gogoType.Elem()).Interface().(gogoproto.Message)
err = d.codec.Unmarshal(anyMsg.Value, msg)
if err != nil {
return nil, err
return nil, errorsmod.Wrap(ErrTxDecode, err.Error())
}
msgs = append(msgs, msg)

Expand Down

0 comments on commit 43c41be

Please sign in to comment.