fix bad-data-bug with multi msgs in module evm

CHANGELOG.md

@@ -53,6 +53,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (api) [\#687](https://github.com/cosmos/ethermint/issues/687) Returns error for a transaction with an incorrect nonce. 
 * (evm) [\#674](https://github.com/cosmos/ethermint/issues/674) Reset all cache after account data has been committed in `EndBlock` to make sure every node state consistent.
 * (evm) [\#672](https://github.com/cosmos/ethermint/issues/672) Fix panic of `wrong Block.Header.AppHash` when restart a node with snapshot.
+* (evm) [\#667](https://github.com/cosmos/ethermint/issues/667) There may be bad data points in CommitStateDB when exec evm transaction with multi msgs.
+* (evm) [\#668](https://github.com/cosmos/ethermint/issues/668) Bad data may be generated due to insufficient gas during the execution of evm transactions.
+* (evm) [\#669](https://github.com/cosmos/ethermint/issues/669) Bad data may be generated due to error returned during the execution of evm transaction.
 
 ## [v0.4.0] - 2020-12-15
 

app/ante/ante.go

@@ -35,6 +35,17 @@ func NewAnteHandler(ak auth.AccountKeeper, evmKeeper EVMKeeper, sk types.SupplyK
 	) (newCtx sdk.Context, err error) {
 		var anteHandler sdk.AnteHandler
 		switch tx.(type) {
+		case evmtypes.MsgEthereumTx:
+			anteHandler = sdk.ChainAnteDecorators(
+				NewEthSetupContextDecorator(), // outermost AnteDecorator. EthSetUpContext must be called first
+				NewEthMempoolFeeDecorator(evmKeeper),
+				authante.NewValidateBasicDecorator(),
+				NewEthSigVerificationDecorator(),
+				NewAccountVerificationDecorator(ak, evmKeeper),
+				NewNonceVerificationDecorator(ak),
+				NewEthGasConsumeDecorator(ak, sk, evmKeeper),
+				NewIncrementSenderSequenceDecorator(ak), // innermost AnteDecorator.
+			)
 		case auth.StdTx:
 			anteHandler = sdk.ChainAnteDecorators(
 				authante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
@@ -49,18 +60,7 @@ func NewAnteHandler(ak auth.AccountKeeper, evmKeeper EVMKeeper, sk types.SupplyK
 				authante.NewSigGasConsumeDecorator(ak, sigGasConsumer),
 				authante.NewSigVerificationDecorator(ak),
 				authante.NewIncrementSequenceDecorator(ak), // innermost AnteDecorator
-			)
-
-		case evmtypes.MsgEthereumTx:
-			anteHandler = sdk.ChainAnteDecorators(
-				NewEthSetupContextDecorator(), // outermost AnteDecorator. EthSetUpContext must be called first
-				NewEthMempoolFeeDecorator(evmKeeper),
-				authante.NewValidateBasicDecorator(),
-				NewEthSigVerificationDecorator(),
-				NewAccountVerificationDecorator(ak, evmKeeper),
-				NewNonceVerificationDecorator(ak),
-				NewEthGasConsumeDecorator(ak, sk, evmKeeper),
-				NewIncrementSenderSequenceDecorator(ak), // innermost AnteDecorator.
+				NewValidateMsgHandlerDecorator(),
 			)
 		default:
 			return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type: %T", tx)

app/ante/validate_msg.go

@@ -0,0 +1,42 @@
+package ante
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	evmtypes "github.com/cosmos/ethermint/x/evm/types"
+)
+
+type ValidateMsgHandler func(ctx sdk.Context, msgs []sdk.Msg) error
+
+type ValidateMsgHandlerDecorator struct {
+}
+
+func NewValidateMsgHandlerDecorator() ValidateMsgHandlerDecorator {
+	return ValidateMsgHandlerDecorator{}
+}
+
+func (vmhd ValidateMsgHandlerDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) {
+	// *ABORT* the tx in case of failing to validate it in checkTx mode
+	if ctx.IsCheckTx() {
+		wrongMsgErr := sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest,
+			"It is not allowed that a transaction with more than one message and contains evm message")
+		msgs := tx.GetMsgs()
+		msgNum := len(msgs)
+		if msgNum == 0 {
+			return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "The msg array from tx cannot be empty")
+		} else if msgNum == 1 {
+			return next(ctx, tx, simulate)
+		}
+
+		for _, msg := range msgs {
+			switch msg.(type) {
+			case evmtypes.MsgEthermint:
+				return ctx, wrongMsgErr
+			default:
+				continue
+			}
+		}
+	}
+
+	return next(ctx, tx, simulate)
+}