evm: support legacy tx

CHANGELOG.md

@@ -54,7 +54,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
-* (evm) [tharsis#24](https://github.com/tharsis/ethermint/pull/24)Implement metrics for `MsgEthereumTx`, state transtitions, `BeginBlock` and `EndBlock`.
+* (evm) [tharsis#66](https://github.com/tharsis/ethermint/issues/66) Support legacy transaction types for signing.
+* (evm) [tharsis#24](https://github.com/tharsis/ethermint/pull/24) Implement metrics for `MsgEthereumTx`, state transtitions, `BeginBlock` and `EndBlock`.
 * (deps) [\#602](https://github.com/cosmos/ethermint/pull/856) Bump tendermint version to [v0.39.3](https://github.com/tendermint/tendermint/releases/tag/v0.39.3)
 
 ### Bug Fixes

app/ante/eth.go

@@ -48,6 +48,10 @@ func (esvd EthSigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, s
  return next(ctx, tx, simulate)
  }
 
+ if len(tx.GetMsgs()) != 1 {
+ return ctx, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "only 1 ethereum msg supported per tx, got %d", len(tx.GetMsgs()))
+ }
+
  // get and set account must be called with an infinite gas meter in order to prevent
  // additional gas from being deducted.
  infCtx := ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
@@ -63,18 +67,21 @@ func (esvd EthSigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, s
  blockNum := big.NewInt(ctx.BlockHeight())
  signer := ethtypes.MakeSigner(ethCfg, blockNum)
 
- for _, msg := range tx.GetMsgs() {
-  msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx)
-  if !ok {
-  return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, &evmtypes.MsgEthereumTx{})
-  }
+ msg := tx.GetMsgs()[0]
+ msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx)
+ if !ok {
+ return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, &evmtypes.MsgEthereumTx{})
+ }
 
-  if _, err := signer.Sender(msgEthTx.AsTransaction()); err != nil {
-  return ctx, sdkerrors.Wrap(sdkerrors.ErrorInvalidSigner, err.Error())
- }
+ sender, err := signer.Sender(msgEthTx.AsTransaction())
+ if err != nil {
+ return ctx, sdkerrors.Wrap(sdkerrors.ErrorInvalidSigner, err.Error())
  }
 
- return next(ctx, tx, simulate)
+ // set up the sender to the transaction field if not already
+ msgEthTx.From = sender.Hex()
+
+ return next(ctx, msgEthTx, simulate)
 }
 
 // EthAccountVerificationDecorator validates an account balance checks
@@ -228,10 +235,6 @@ func (egcd EthGasConsumeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simula
  // additional gas from being deducted.
  infCtx := ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
 
- if len(tx.GetMsgs()) != 1 {
- return ctx, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "only 1 ethereum msg supported per tx, got %d", len(tx.GetMsgs()))
- }
-
  // reset the refund gas value in the keeper for the current transaction
  egcd.evmKeeper.ResetRefundTransient(infCtx)
 
@@ -331,14 +334,15 @@ func (ctd CanTransferDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
  }
 
  ethCfg := config.EthereumConfig(ctd.evmKeeper.ChainID())
+ signer := ethtypes.MakeSigner(ethCfg, big.NewInt(ctx.BlockHeight()))
 
  for _, msg := range tx.GetMsgs() {
  msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx)
  if !ok {
  return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type: %T", msg)
  }
 
- coreMsg, err := msgEthTx.AsMessage()
+ coreMsg, err := msgEthTx.AsMessage(signer)
  if err != nil {
  return ctx, err
  }
@@ -409,12 +413,9 @@ func (ald AccessListDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate b
  return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type: %T", msg)
  }
 
- coreMsg, err := msgEthTx.AsMessage()
- if err != nil {
- return ctx, sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "tx cannot be expressed as core.Message: %s", err.Error())
- }
+ sender := common.BytesToAddress(msgEthTx.GetFrom())
 
- ald.evmKeeper.PrepareAccessList(coreMsg.From(), coreMsg.To(), vm.ActivePrecompiles(rules), coreMsg.AccessList())
+ ald.evmKeeper.PrepareAccessList(sender, msgEthTx.To(), vm.ActivePrecompiles(rules), *msgEthTx.Data.Accesses.ToEthAccessList())
  }
 
  // set the original gas meter

app/ante/eth_test.go

@@ -310,13 +310,16 @@ func (suite AnteTestSuite) TestEthGasConsumeDecorator() {
 func (suite AnteTestSuite) TestCanTransferDecorator() {
  dec := ante.NewCanTransferDecorator(suite.app.EvmKeeper)
 
- addr, _ := newTestAddrKey()
+ addr, privKey := newTestAddrKey()
 
- tx := evmtypes.NewMsgEthereumTxContract(suite.app.EvmKeeper.ChainID(), 1, big.NewInt(10), 1000, big.NewInt(1), nil, nil)
- tx2 := evmtypes.NewMsgEthereumTxContract(suite.app.EvmKeeper.ChainID(), 1, big.NewInt(10), 1000, big.NewInt(1), nil, nil)
+ tx := evmtypes.NewMsgEthereumTxContract(suite.app.EvmKeeper.ChainID(), 1, big.NewInt(10), 1000, big.NewInt(1), nil, &ethtypes.AccessList{})
+ tx2 := evmtypes.NewMsgEthereumTxContract(suite.app.EvmKeeper.ChainID(), 1, big.NewInt(10), 1000, big.NewInt(1), nil, &ethtypes.AccessList{})
 
  tx.From = addr.Hex()
 
+ err := tx.Sign(suite.ethSigner, tests.NewSigner(privKey))
+ suite.Require().NoError(err)
+
  testCases := []struct {
  name string
  tx sdk.Tx
@@ -376,7 +379,6 @@ func (suite AnteTestSuite) TestAccessListDecorator() {
 
  tx := evmtypes.NewMsgEthereumTxContract(suite.app.EvmKeeper.ChainID(), 1, big.NewInt(10), 1000, big.NewInt(1), nil, nil)
  tx2 := evmtypes.NewMsgEthereumTxContract(suite.app.EvmKeeper.ChainID(), 1, big.NewInt(10), 1000, big.NewInt(1), nil, al)
- tx3 := evmtypes.NewMsgEthereumTxContract(suite.app.EvmKeeper.ChainID(), 1, big.NewInt(10), 1000, big.NewInt(1), nil, nil)
 
  tx.From = addr.Hex()
  tx2.From = addr.Hex()
@@ -388,7 +390,6 @@ func (suite AnteTestSuite) TestAccessListDecorator() {
  expPass bool
  }{
  {"invalid transaction type", &invalidTx{}, func() {}, false},
- {"AsMessage failed", tx3, func() {}, false},
  {
  "success - no access list",
  tx,