feat: refactor MsgEthereumTx with eth transaction

Closes: #220

cleanup

fix tests

fix evm test cases

Author: yihuang

ante/evm/04_validate.go

@@ -6,6 +6,7 @@ import (
 
 	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
+	ethtypes "github.com/ethereum/go-ethereum/core/types"
 
 	errorsmod "cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
@@ -21,7 +22,7 @@ import (
 // - If the transaction is a contract creation or call, the corresponding operation must be enabled in the EVM parameters
 func ValidateMsg(
 	evmParams evmtypes.Params,
-	txData evmtypes.TxData,
+	txData *ethtypes.Transaction,
 	from sdktypes.AccAddress,
 ) error {
 	if from != nil {
@@ -37,10 +38,10 @@ func ValidateMsg(
 // checkDisabledCreateCall checks if the transaction is a contract creation or call,
 // and if those actions are disabled through governance.
 func checkDisabledCreateCall(
-	txData evmtypes.TxData,
+	txData *ethtypes.Transaction,
 	permissions *evmtypes.AccessControl,
 ) error {
-	to := txData.GetTo()
+	to := txData.To()
 	blockCreate := permissions.Create.AccessType == evmtypes.AccessTypeRestricted
 	blockCall := permissions.Call.AccessType == evmtypes.AccessTypeRestricted
 

ante/evm/05_signature_verification.go

@@ -1,6 +1,7 @@
 package evm
 
 import (
+	"bytes"
 	"math/big"
 
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
@@ -92,7 +93,12 @@ func SignatureVerification(
 		)
 	}
 
-	// set up the sender to the transaction field if not already
-	msg.From = sender.Hex()
+	if !bytes.Equal(msg.From, sender.Bytes()) {
+		return errorsmod.Wrapf(
+			errortypes.ErrorInvalidSigner,
+			"rejected ethereum transaction with invalid sender address; expected %s, got %s",
+			evmtypes.HexAddress(msg.From), sender.String(),
+		)
+	}
 	return nil
 }

ante/evm/06_account_verification.go

@@ -2,11 +2,11 @@ package evm
 
 import (
 	"github.com/ethereum/go-ethereum/common"
+	ethtypes "github.com/ethereum/go-ethereum/core/types"
 
 	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
 	"github.com/cosmos/evm/x/vm/keeper"
 	"github.com/cosmos/evm/x/vm/statedb"
-	evmtypes "github.com/cosmos/evm/x/vm/types"
 
 	errorsmod "cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
@@ -25,7 +25,7 @@ func VerifyAccountBalance(
 	accountKeeper anteinterfaces.AccountKeeper,
 	account *statedb.Account,
 	from common.Address,
-	txData evmtypes.TxData,
+	txData *ethtypes.Transaction,
 ) error {
 	// Only EOA are allowed to send transactions.
 	if account != nil && account.IsContract() {

ante/evm/08_gas_consume.go

@@ -4,6 +4,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
+	ethtypes "github.com/ethereum/go-ethereum/core/types"
 
 	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
 	"github.com/cosmos/evm/types"
@@ -84,7 +85,7 @@ func deductFees(
 
 // GetMsgPriority returns the priority of an Eth Tx capped by the minimum priority
 func GetMsgPriority(
-	txData evmtypes.TxData,
+	txData *ethtypes.Transaction,
 	minPriority int64,
 	baseFee *big.Int,
 ) int64 {

ante/evm/11_emit_event.go

@@ -57,7 +57,7 @@ func EmitTxHashEvent(ctx sdk.Context, msg *evmtypes.MsgEthereumTx, blockTxIndex,
 	ctx.EventManager().EmitEvent(
 		sdk.NewEvent(
 			evmtypes.EventTypeEthereumTx,
-			sdk.NewAttribute(evmtypes.AttributeKeyEthereumTxHash, msg.Hash),
+			sdk.NewAttribute(evmtypes.AttributeKeyEthereumTxHash, msg.Hash().String()),
 			sdk.NewAttribute(evmtypes.AttributeKeyTxIndex, strconv.FormatUint(blockTxIndex+msgIndex, 10)), // #nosec G115
 		),
 	)

ante/evm/mono_decorator.go

@@ -83,8 +83,8 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 			return ctx, err
 		}
 
-		feeAmt := txData.Fee()
-		gas := txData.GetGas()
+		feeAmt := ethMsg.GetFee()
+		gas := txData.Gas()
 		fee := sdkmath.LegacyNewDecFromBigInt(feeAmt)
 		gasLimit := sdkmath.LegacyNewDecFromBigInt(new(big.Int).SetUint64(gas))
 
@@ -99,13 +99,13 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 			}
 		}
 
-		if txData.TxType() == ethtypes.DynamicFeeTxType && decUtils.BaseFee != nil {
+		if txData.Type() == ethtypes.DynamicFeeTxType && decUtils.BaseFee != nil {
 			// If the base fee is not empty, we compute the effective gas price
 			// according to current base fee price. The gas limit is specified
 			// by the user, while the price is given by the minimum between the
 			// max price paid for the entire tx, and the sum between the price
 			// for the tip and the base fee.
-			feeAmt = txData.EffectiveFee(decUtils.BaseFee)
+			feeAmt = ethMsg.GetEffectiveFee(decUtils.BaseFee)
 			fee = sdkmath.LegacyNewDecFromBigInt(feeAmt)
 		}
 
@@ -211,7 +211,7 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 
 		// Update the fee to be paid for the tx adding the fee specified for the
 		// current message.
-		decUtils.TxFee.Add(decUtils.TxFee, txData.Fee())
+		decUtils.TxFee.Add(decUtils.TxFee, ethMsg.GetFee())
 
 		// Update the transaction gas limit adding the gas specified in the
 		// current message.
@@ -228,7 +228,7 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 			)
 		}
 
-		if err := IncrementNonce(ctx, md.accountKeeper, acc, txData.GetNonce()); err != nil {
+		if err := IncrementNonce(ctx, md.accountKeeper, acc, txData.Nonce()); err != nil {
 			return ctx, err
 		}
 

api/cosmos/evm/vm/v1/access_list_tx.go

@@ -3,32 +3,9 @@ package vmv1
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	protov2 "google.golang.org/protobuf/proto"
 )
 
-// supportedTxs holds the Ethereum transaction types
-// supported by Cosmos EVM
-//
-// Use a function to return a new pointer and avoid
-// possible reuse or racing conditions when using the same pointer
-var supportedTxs = map[string]func() TxDataV2{
-	"/cosmos.evm.vm.v1.DynamicFeeTx": func() TxDataV2 { return &DynamicFeeTx{} },
-	"/cosmos.evm.vm.v1.AccessListTx": func() TxDataV2 { return &AccessListTx{} },
-	"/cosmos.evm.vm.v1.LegacyTx":     func() TxDataV2 { return &LegacyTx{} },
-}
-
-// getSender extracts the sender address from the signature values using the latest signer for the given chainID.
-func getSender(txData TxDataV2) (common.Address, error) {
-	signer := ethtypes.LatestSignerForChainID(txData.GetChainID())
-	from, err := signer.Sender(ethtypes.NewTx(txData.AsEthereumData()))
-	if err != nil {
-		return common.Address{}, err
-	}
-	return from, nil
-}
-
 // GetSigners is the custom function to get signers on Ethereum transactions
 // Gets the signer's address from the Ethereum tx signature
 func GetSigners(msg protov2.Message) ([][]byte, error) {
@@ -37,21 +14,5 @@ func GetSigners(msg protov2.Message) ([][]byte, error) {
 		return nil, fmt.Errorf("invalid type, expected MsgEthereumTx and got %T", msg)
 	}
 
-	txDataFn, found := supportedTxs[msgEthTx.Data.TypeUrl]
-	if !found {
-		return nil, fmt.Errorf("invalid TypeUrl %s", msgEthTx.Data.TypeUrl)
-	}
-	txData := txDataFn()
-
-	// msgEthTx.Data is a message (DynamicFeeTx, LegacyTx or AccessListTx)
-	if err := msgEthTx.Data.UnmarshalTo(txData); err != nil {
-		return nil, err
-	}
-
-	sender, err := getSender(txData)
-	if err != nil {
-		return nil, err
-	}
-
-	return [][]byte{sender.Bytes()}, nil
+	return [][]byte{msgEthTx.From}, nil
 }