Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore(erc20): keep MsgConvertCoin interface registered (backport #2892) #2893

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 27, 2024
Merged

chore(erc20): keep MsgConvertCoin interface registered (backport #2892) #2893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba3be7e
chore(erc20): keep MsgConvertCoin interface registered (#2892)
GAtom22 Sep 27, 2024
eaab4dc
fix conflicts
GAtom22 Sep 27, 2024
88c0d71
add methods to comply with Msg interface
GAtom22 Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,15 @@ Ref: https://keepachangelog.com/en/1.0.0/

## Unreleased

### State Machine Breaking

- (rpc) [#2877](https://github.com/evmos/evmos/pull/2877) Add revert reason for `eth_estimateGas`

## [v19.2.0] - 2024-08-19
### Bug Fixes

- (erc20) [#2892](https://github.com/evmos/evmos/pull/2892) Keep `MsgConvertCoin` interface registered for backwards compatibility.

## [v19.2.0](https://github.com/evmos/evmos/releases/tag/v19.2.0) - 2024-08-19

### State Machine Breaking

Expand Down
3 changes: 3 additions & 0 deletions x/erc20/types/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ var (
const (
// Amino names
convertERC20Name = "evmos/MsgConvertERC20"
convertCoinName = "evmos/MsgConvertCoin" // keep it for backwards compatibility when querying txs
updateParams = "evmos/erc20/MsgUpdateParams"
)

Expand All @@ -41,6 +42,7 @@ func init() {
func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
registry.RegisterImplementations(
(*sdk.Msg)(nil),
&MsgConvertCoin{}, // keep it for backwards compatibility when querying txs
&MsgConvertERC20{},
&MsgUpdateParams{},
)
Expand All @@ -60,4 +62,5 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
cdc.RegisterConcrete(&MsgUpdateParams{}, updateParams, nil)
cdc.RegisterConcrete(&MsgConvertERC20{}, convertERC20Name, nil)
cdc.RegisterConcrete(&MsgConvertCoin{}, convertCoinName, nil)
}
34 changes: 34 additions & 0 deletions x/erc20/types/msg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"

"github.com/ethereum/go-ethereum/common"
)

var (
_ sdk.Msg = &MsgConvertERC20{}
_ sdk.Msg = &MsgConvertCoin{}
_ sdk.Msg = &MsgUpdateParams{}
)

Expand Down Expand Up @@ -85,3 +87,35 @@ func (m *MsgUpdateParams) ValidateBasic() error {
func (m MsgUpdateParams) GetSignBytes() []byte {
return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(&m))
}

// ValidateBasic runs stateless checks on the message
func (msg MsgConvertCoin) ValidateBasic() error {
if err := ValidateErc20Denom(msg.Coin.Denom); err != nil {
if err := ibctransfertypes.ValidateIBCDenom(msg.Coin.Denom); err != nil {
return err
}
}

if !msg.Coin.Amount.IsPositive() {
return errorsmod.Wrapf(errortypes.ErrInvalidCoins, "cannot mint a non-positive amount")
}
_, err := sdk.AccAddressFromBech32(msg.Sender)
if err != nil {
return errorsmod.Wrap(err, "invalid sender address")
}
if !common.IsHexAddress(msg.Receiver) {
return errorsmod.Wrapf(errortypes.ErrInvalidAddress, "invalid receiver hex address %s", msg.Receiver)
}
return nil
}

// GetSignBytes encodes the message for signing
func (msg MsgConvertCoin) GetSignBytes() []byte {
return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(&msg))
}

// GetSigners defines whose signature is required
func (msg MsgConvertCoin) GetSigners() []sdk.AccAddress {
addr := sdk.MustAccAddressFromBech32(msg.Sender)
return []sdk.AccAddress{addr}
}
Loading