chore(ante): revert mono ante handler for v16.0.0-rc1 (evmos#2116)

revert mono ante handler Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
qtpgv969wsyj · Dec 4, 2023 · 76d1754 · 76d1754
1 parent f92c1fc
commit 76d1754
Show file tree

Hide file tree

Showing 30 changed files with 951 additions and 1,805 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -94,7 +94,6 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - (osmosis-outpost) [#2017](https://github.com/evmos/evmos/pull/2017) Refactor types, errors and precompile struct.
 - (erc20) [#2023](https://github.com/evmos/evmos/pull/2023) Add tests for ERC20 precompile queries.
 - (osmosis-outpost) [#2025](https://github.com/evmos/evmos/pull/2025) Use a struct to wrap parsed parameters from Solidity.
-- (ante) [#2028](https://github.com/evmos/evmos/pull/2028) MonoAnteHandler for EVM transaction.
 - (staking) [#2030](https://github.com/evmos/evmos/pull/2030) Implement the `CreateValidator` function for staking precompiled contract.
 - (erc20) [#2037](https://github.com/evmos/evmos/pull/2037) Add IsTransactions and RequiredGas tests for the ERC20 extension.
 - (bank) [#2040](https://github.com/evmos/evmos/pull/2040) Add bank extension unit tests for queries.
@@ -181,6 +180,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - (gov) [#1981](https://github.com/evmos/evmos/pull/1981) Remove deprecated `cosmos.params.v1beta1/ParameterChangeProposal` handler
 - (revenue) [#2032](https://github.com/evmos/evmos/pull/2032) Fixed the problem that users cannot send transactions with gasPrice of 0 to precompiled contracts.
 
+
 ## [v14.1.0] - 2023-09-25
 
 ### Bug Fixes

diff --git a/app/ante/ante.go b/app/ante/ante.go
@@ -1,5 +1,6 @@
 // Copyright Tharsis Labs Ltd.(Evmos)
 // SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE)
+
 package ante
 
 import (
@@ -26,7 +27,7 @@ func NewAnteHandler(options HandlerOptions) sdk.AnteHandler {
 				switch typeURL := opts[0].GetTypeUrl(); typeURL {
 				case "/ethermint.evm.v1.ExtensionOptionsEthereumTx":
 					// handle as *evmtypes.MsgEthereumTx
-					anteHandler = newMonoEVMAnteHandler(options) // TODO: replace for mono EVM AnteHandler
+					anteHandler = newEVMAnteHandler(options)
 				case "/ethermint.types.v1.ExtensionOptionsWeb3Tx":
 					// handle as normal Cosmos SDK tx, except signature is checked for EIP712 representation
 					anteHandler = newLegacyCosmosAnteHandlerEip712(options)

diff --git a/app/ante/cosmos.go b/app/ante/cosmos.go
diff --git a/app/ante/evm.go b/app/ante/evm.go
diff --git a/app/ante/evm/01_setup_ctx.go b/app/ante/evm/01_setup_ctx.go
diff --git a/app/ante/evm/02_mempool_fee.go b/app/ante/evm/02_mempool_fee.go
diff --git a/app/ante/evm/03_global_fee.go b/app/ante/evm/03_global_fee.go