Merge branch 'main' into fedekunze/fix-params

CHANGELOG.md

@@ -42,6 +42,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 * (deps) [\#1159](https://github.com/evmos/ethermint/pull/1159) Bump Geth version to `v1.10.19`.
 * (deps) [#1167](https://github.com/evmos/ethermint/pull/1167) Upgrade ibc-go to v4.
+* (evm) [\#1174](https://github.com/evmos/ethermint/pull/1174) Don't allow eth txs with 0 in mempool.
 
 ### Improvements
 
@@ -51,6 +52,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Bug Fixes
 
 * (rpc) [\#1190](https://github.com/evmos/ethermint/issues/1190) Fix `UnmarshalJSON` panig of breaking EVM and fee market `Params`.
+* (rpc) [#1179](https://github.com/evmos/ethermint/pull/1179) Fix gas used in traceTransaction response.
 
 ## [v0.17.0] - 2022-06-27
 

app/ante/ante.go

@@ -23,7 +23,10 @@ const (
 // Ethereum or SDK transaction to an internal ante handler for performing
 // transaction-level processing (e.g. fee payment, signature verification) before
 // being passed onto it's respective handler.
-func NewAnteHandler(options HandlerOptions) sdk.AnteHandler {
+func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
+ if err := options.validate(); err != nil {
+ return nil, err
+ }
  return func(
  ctx sdk.Context, tx sdk.Tx, sim bool,
  ) (newCtx sdk.Context, err error) {
@@ -62,7 +65,7 @@ func NewAnteHandler(options HandlerOptions) sdk.AnteHandler {
  }
 
  return anteHandler(ctx, tx, sim)
- }
+ }, nil
 }
 
 func Recover(logger tmlog.Logger, err *error) {

app/ante/handler_options.go

@@ -28,7 +28,7 @@ type HandlerOptions struct {
  MaxTxGasWanted uint64
 }
 
-func (options HandlerOptions) Validate() error {
+func (options HandlerOptions) validate() error {
  if options.AccountKeeper == nil {
  return sdkerrors.Wrap(sdkerrors.ErrLogic, "account keeper is required for AnteHandler")
  }

app/ante/utils_test.go

@@ -105,7 +105,7 @@ func (suite *AnteTestSuite) SetupTest() {
 
  suite.clientCtx = client.Context{}.WithTxConfig(encodingConfig.TxConfig)
 
- options := ante.HandlerOptions{
+ anteHandler, err := ante.NewAnteHandler(ante.HandlerOptions{
  AccountKeeper: suite.app.AccountKeeper,
  BankKeeper: suite.app.BankKeeper,
  EvmKeeper: suite.app.EvmKeeper,
@@ -114,11 +114,10 @@ func (suite *AnteTestSuite) SetupTest() {
  FeeMarketKeeper: suite.app.FeeMarketKeeper,
  SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
  SigGasConsumer: ante.DefaultSigVerificationGasConsumer,
- }
-
- suite.Require().NoError(options.Validate())
+ })
+ suite.Require().NoError(err)
 
- suite.anteHandler = ante.NewAnteHandler(options)
+ suite.anteHandler = anteHandler
  suite.ethSigner = ethtypes.LatestSignerForChainID(suite.app.EvmKeeper.ChainID())
 }
 

app/app.go

@@ -570,7 +570,7 @@ func NewEthermintApp(
  // use Ethermint's custom AnteHandler
 
  maxGasWanted := cast.ToUint64(appOpts.Get(srvflags.EVMMaxTxGasWanted))
- options := ante.HandlerOptions{
+ anteHandler, err := ante.NewAnteHandler(ante.HandlerOptions{
  AccountKeeper: app.AccountKeeper,
  BankKeeper: app.BankKeeper,
  EvmKeeper: app.EvmKeeper,
@@ -580,13 +580,11 @@ func NewEthermintApp(
  SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
  SigGasConsumer: ante.DefaultSigVerificationGasConsumer,
  MaxTxGasWanted: maxGasWanted,
- }
-
- if err := options.Validate(); err != nil {
+ })
+ if err != nil {
  panic(err)
  }
-
- app.SetAnteHandler(ante.NewAnteHandler(options))
+ app.SetAnteHandler(anteHandler)
  app.SetEndBlocker(app.EndBlocker)
 
  if loadLatest {