imp(ante): depecrate legacy EIP712 ante handler

CHANGELOG.md

@@ -40,6 +40,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### API Breaking
 
 - (inflation) [#2015](https://github.com/evmos/evmos/pull/2015) Rename `inflation` module to `inflation/v1`.
+- (ante) [#2078](https://github.com/evmos/evmos/pull/2078) depecrate legacy EIP712 ante handler
 
 ### Features
 

app/ante/ante.go

@@ -26,10 +26,7 @@
 				switch typeURL := opts[0].GetTypeUrl(); typeURL {
 				case "/ethermint.evm.v1.ExtensionOptionsEthereumTx":
 					// handle as *evmtypes.MsgEthereumTx
-					anteHandler = newMonoEVMAnteHandler(options) // TODO: replace for mono EVM AnteHandler
-				case "/ethermint.types.v1.ExtensionOptionsWeb3Tx":
-					// handle as normal Cosmos SDK tx, except signature is checked for EIP712 representation
-					anteHandler = newLegacyCosmosAnteHandlerEip712(options)
+					anteHandler = newMonoEVMAnteHandler(options)
 				case "/ethermint.types.v1.ExtensionOptionDynamicFeeTx":
 					// cosmos-sdk tx with dynamic fee extension
 					anteHandler = newCosmosAnteHandler(options)

app/ante/cosmos/authz_test.go

@@ -431,7 +431,6 @@ func (suite *AnteTestSuite) TestRejectMsgsInAuthz() {
 					suite.app,
 					utiltx.EIP712TxArgs{
 						CosmosTxArgs:       cosmosTxArgs,
-						UseLegacyExtension: true,
 						UseLegacyTypedData: true,
 					},
 				)

app/ante/evm.go

@@ -5,12 +5,7 @@ package ante
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/auth/ante"
-	sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
-	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
-	cosmosante "github.com/evmos/evmos/v15/app/ante/cosmos"
 	evmante "github.com/evmos/evmos/v15/app/ante/evm"
-	evmtypes "github.com/evmos/evmos/v15/x/evm/types"
 )
 
 func newMonoEVMAnteHandler(options HandlerOptions) sdk.AnteHandler {
@@ -48,32 +43,3 @@ func newEVMAnteHandler(options HandlerOptions) sdk.AnteHandler { //nolint: unuse
 		evmante.NewEthEmitEventDecorator(options.EvmKeeper),
 	)
 }
-
-// newCosmosAnteHandlerEip712 creates the ante handler for transactions signed with EIP712
-func newLegacyCosmosAnteHandlerEip712(options HandlerOptions) sdk.AnteHandler {
-	return sdk.ChainAnteDecorators(
-		cosmosante.RejectMessagesDecorator{}, // reject MsgEthereumTxs
-		cosmosante.NewAuthzLimiterDecorator( // disable the Msg types that cannot be included on an authz.MsgExec msgs field
-			sdk.MsgTypeURL(&evmtypes.MsgEthereumTx{}),
-			sdk.MsgTypeURL(&sdkvesting.MsgCreateVestingAccount{}),
-		),
-		ante.NewSetUpContextDecorator(),
-		ante.NewValidateBasicDecorator(),
-		ante.NewTxTimeoutHeightDecorator(),
-		cosmosante.NewMinGasPriceDecorator(options.FeeMarketKeeper, options.EvmKeeper),
-		ante.NewValidateMemoDecorator(options.AccountKeeper),
-		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
-		cosmosante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.DistributionKeeper, options.FeegrantKeeper, options.StakingKeeper, options.TxFeeChecker),
-		cosmosante.NewVestingDelegationDecorator(options.AccountKeeper, options.StakingKeeper, options.BankKeeper, options.Cdc),
-		// SetPubKeyDecorator must be called before all signature verification decorators
-		ante.NewSetPubKeyDecorator(options.AccountKeeper),
-		ante.NewValidateSigCountDecorator(options.AccountKeeper),
-		ante.NewSigGasConsumeDecorator(options.AccountKeeper, options.SigGasConsumer),
-		// Note: signature verification uses EIP instead of the cosmos signature validator
-		//nolint: staticcheck
-		cosmosante.NewLegacyEip712SigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
-		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
-		ibcante.NewRedundantRelayDecorator(options.IBCKeeper),
-		evmante.NewGasWantedDecorator(options.EvmKeeper, options.FeeMarketKeeper),
-	)
-}

app/ante/evm/setup_test.go

@@ -35,7 +35,6 @@ type AnteTestSuite struct {
 	enableFeemarket          bool
 	enableLondonHF           bool
 	evmParamsOption          func(*evmtypes.Params)
-	useLegacyEIP712Extension bool
 	useLegacyEIP712TypedData bool
 }
 
@@ -123,13 +122,11 @@ func TestAnteTestSuite(t *testing.T) {
 	// LegacyEIP712Extension should not be run with current TypedData encodings, since they are not compatible.
 	suite.Run(t, &AnteTestSuite{
 		enableLondonHF:           true,
-		useLegacyEIP712Extension: true,
 		useLegacyEIP712TypedData: true,
 	})
 
 	suite.Run(t, &AnteTestSuite{
 		enableLondonHF:           true,
-		useLegacyEIP712Extension: false,
 		useLegacyEIP712TypedData: true,
 	})
 }

app/ante/evm/utils_test.go

@@ -466,7 +466,6 @@ func (suite *AnteTestSuite) CreateTestEIP712CosmosTxBuilder(
 		suite.app,
 		utiltx.EIP712TxArgs{
 			CosmosTxArgs:       cosmosTxArgs,
-			UseLegacyExtension: suite.useLegacyEIP712Extension,
 			UseLegacyTypedData: suite.useLegacyEIP712TypedData,
 		},
 	)

testutil/tx/eip712.go

@@ -24,7 +24,6 @@ import (
 
 type EIP712TxArgs struct {
 	CosmosTxArgs       CosmosTxArgs
-	UseLegacyExtension bool
 	UseLegacyTypedData bool
 }
 
@@ -41,12 +40,6 @@ type signatureV2Args struct {
 	nonce     uint64
 }
 
-type legacyWeb3ExtensionArgs struct {
-	feePayer  string
-	chainID   uint64
-	signature []byte
-}
-
 // CreateEIP712CosmosTx creates a cosmos tx for typed data according to EIP712.
 // Also, signs the tx with the provided messages and private key.
 // It returns the signed transaction and an error
@@ -122,7 +115,6 @@ func PrepareEIP712CosmosTx(
 		appEvmos,
 		args,
 		builder,
-		chainIDNum,
 		typedData,
 	)
 }
@@ -134,7 +126,6 @@ func signCosmosEIP712Tx(
 	appEvmos *app.Evmos,
 	args EIP712TxArgs,
 	builder authtx.ExtensionOptionsTxBuilder,
-	chainID uint64,
 	data apitypes.TypedData,
 ) (client.TxBuilder, error) {
 	priv := args.CosmosTxArgs.Priv
@@ -157,25 +148,12 @@ func signCosmosEIP712Tx(
 	}
 	signature[crypto.RecoveryIDOffset] += 27 // Transform V from 0/1 to 27/28 according to the yellow paper
 
-	if args.UseLegacyExtension {
-		if err := setBuilderLegacyWeb3Extension(
-			builder,
-			legacyWeb3ExtensionArgs{
-				feePayer:  from.String(),
-				chainID:   chainID,
-				signature: signature,
-			}); err != nil {
-			return nil, err
-		}
-	}
-
 	sigsV2 := getTxSignatureV2(
 		signatureV2Args{
 			pubKey:    pubKey,
 			signature: signature,
 			nonce:     nonce,
 		},
-		args.UseLegacyExtension,
 	)
 
 	err = builder.SetSignatures(sigsV2)
@@ -211,35 +189,9 @@ func createTypedData(args typedDataArgs, useLegacy bool) (apitypes.TypedData, er
 	return eip712.WrapTxToTypedData(args.chainID, args.data)
 }
 
-// setBuilderLegacyWeb3Extension creates a legacy ExtensionOptionsWeb3Tx and
-// appends it to the builder options.
-func setBuilderLegacyWeb3Extension(builder authtx.ExtensionOptionsTxBuilder, args legacyWeb3ExtensionArgs) error {
-	option, err := codectypes.NewAnyWithValue(&types.ExtensionOptionsWeb3Tx{
-		FeePayer:         args.feePayer,
-		TypedDataChainID: args.chainID,
-		FeePayerSig:      args.signature,
-	})
-	if err != nil {
-		return err
-	}
-
-	builder.SetExtensionOptions(option)
-	return nil
-}
-
 // getTxSignatureV2 returns the SignatureV2 object corresponding to
 // the arguments, using the legacy implementation as needed.
-func getTxSignatureV2(args signatureV2Args, useLegacyExtension bool) signing.SignatureV2 {
-	if useLegacyExtension {
-		return signing.SignatureV2{
-			PubKey: args.pubKey,
-			Data: &signing.SingleSignatureData{
-				SignMode: signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
-			},
-			Sequence: args.nonce,
-		}
-	}
-
+func getTxSignatureV2(args signatureV2Args) signing.SignatureV2 {
 	// Must use SIGN_MODE_DIRECT, since Amino has some trouble parsing certain Any values from a SignDoc
 	// with the Legacy EIP-712 TypedData encodings. This is not an issue with the latest encoding.
 	return signing.SignatureV2{