feat: refactor MsgEthereumTx with eth transaction

ante/evm/04_validate.go

@@ -4,6 +4,8 @@ import (
 	"errors"
 	"math/big"
 
+	ethtypes "github.com/ethereum/go-ethereum/core/types"
+
 	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
 
@@ -17,17 +19,14 @@ import (
 
 // ValidateMsg validates an Ethereum specific message type and returns an error
 // if invalid. It checks the following requirements:
-// - nil MUST be passed as the from address
 // - 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,
-	from sdktypes.AccAddress,
+	txData *ethtypes.Transaction,
 ) error {
-	if from != nil {
-		return errorsmod.Wrapf(errortypes.ErrInvalidRequest, "invalid from address; expected nil; got: %q", from.String())
+	if txData == nil {
+		return errorsmod.Wrap(errortypes.ErrInvalidRequest, "transaction is nil")
 	}
-
 	return checkDisabledCreateCall(
 		txData,
 		&evmParams.AccessControl,
@@ -37,10 +36,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"
@@ -22,19 +22,24 @@ import (
 // - account balance is lower than the transaction cost
 func VerifyAccountBalance(
 	ctx sdk.Context,
+	evmKeeper anteinterfaces.EVMKeeper,
 	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() {
-		return errorsmod.Wrapf(
-			errortypes.ErrInvalidType,
-			"the sender is not EOA: address %s", from,
-		)
+		// check eip-7702
+		code := evmKeeper.GetCode(ctx, common.BytesToHash(account.CodeHash))
+		_, delegated := ethtypes.ParseDelegation(code)
+		if len(code) > 0 && !delegated {
+			return errorsmod.Wrapf(
+				errortypes.ErrInvalidType,
+				"the sender is not EOA: address %s", from,
+			)
+		}
 	}
-
 	if account == nil {
 		acc := accountKeeper.NewAccountWithAddress(ctx, from.Bytes())
 		accountKeeper.SetAccount(ctx, acc)

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

@@ -88,8 +88,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))
 
@@ -104,13 +104,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)
 	}
 
@@ -123,7 +123,6 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 	if err := ValidateMsg(
 		decUtils.EvmParams,
 		txData,
-		ethMsg.GetFrom(),
 	); err != nil {
 		return ctx, err
 	}
@@ -147,6 +146,7 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 	account := md.evmKeeper.GetAccount(ctx, fromAddr)
 	if err := VerifyAccountBalance(
 		ctx,
+		md.evmKeeper,
 		md.accountKeeper,
 		account,
 		fromAddr,
@@ -216,7 +216,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.
@@ -233,7 +233,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
 	}
 

ante/evm/mono_decorator_test.go

@@ -117,10 +117,9 @@ func signMsgEthereumTx(t *testing.T, privKey *ethsecp256k1.PrivKey, args *evmsdk
 	t.Helper()
 	msg := evmsdktypes.NewTx(args)
 	fromAddr := common.BytesToAddress(privKey.PubKey().Address().Bytes())
-	msg.From = fromAddr.Hex()
+	msg.From = fromAddr.Bytes()
 	ethSigner := ethtypes.LatestSignerForChainID(evmsdktypes.GetEthChainConfig().ChainID)
 	require.NoError(t, msg.Sign(ethSigner, utiltx.NewSigner(privKey)))
-	msg.From = ""
 	return msg
 }