Merge pull request #123 from SigmaGmbH/refactor/disable-eip712

Refactor/disable eip712

app/ante/ante.go

@@ -58,9 +58,6 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 				case "/ethermint.evm.v1.ExtensionOptionsEthereumTx":
 					// handle as *evmtypes.MsgHandleTx
 					anteHandler = NewEthAnteHandler(options)
-				case "/ethermint.types.v1.ExtensionOptionsWeb3Tx":
-					// Deprecated: Handle as normal Cosmos SDK tx, except signature is checked for Legacy EIP712 representation
-					anteHandler = NewLegacyCosmosAnteHandlerEip712(options)
 				case "/ethermint.types.v1.ExtensionOptionDynamicFeeTx":
 					// cosmos-sdk tx with dynamic fee extension
 					anteHandler = NewCosmosAnteHandler(options)

app/ante/utils_test.go

@@ -36,7 +36,6 @@ import (
 	ante "swisstronik/app/ante"
 	"swisstronik/crypto/ethsecp256k1"
 	"swisstronik/encoding"
-	"swisstronik/ethereum/eip712"
 	"swisstronik/tests"
 	"swisstronik/types"
 	"swisstronik/utils"
@@ -56,9 +55,6 @@ type AnteTestSuite struct {
 	enableLondonHF  bool
 	evmParamsOption func(*evmtypes.Params)
 	priv            *ethsecp256k1.PrivKey
-
-	useLegacyEIP712Extension bool
-	useLegacyEIP712TypedData bool
 }
 
 const TestGasLimit uint64 = 100000
@@ -122,7 +118,6 @@ func (suite *AnteTestSuite) SetupTest() {
 	encodingConfig := encoding.MakeConfig(app.ModuleBasics)
 	// We're using TestMsg amino encoding in some tests, so register it here.
 	encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil)
-	eip712.SetEncodingConfig(encodingConfig)
 
 	suite.clientCtx = client.Context{}.WithTxConfig(encodingConfig.TxConfig)
 	suite.Require().NotNil(suite.app.AppCodec())
@@ -332,18 +327,10 @@ func (suite *AnteTestSuite) GenerateMultipleKeys(n int) ([]cryptotypes.PrivKey,
 
 // generateSingleSignature signs the given sign doc bytes using the given signType (EIP-712 or Standard)
 func (suite *AnteTestSuite) generateSingleSignature(signMode signing.SignMode, privKey cryptotypes.PrivKey, signDocBytes []byte, signType string) (signature signing.SignatureV2) {
-	var (
-		msg []byte
-		err error
-	)
+	var msg []byte
 
 	msg = signDocBytes
 
-	if signType == "EIP-712" {
-		msg, err = eip712.GetEIP712BytesForMsg(signDocBytes)
-		suite.Require().NoError(err)
-	}
-
 	sigBytes, _ := privKey.Sign(msg)
 	sigData := &signing.SingleSignatureData{
 		SignMode:  signMode,

app/app.go

@@ -118,7 +118,6 @@ import (
 	"swisstronik/app/upgrades/v1_0_3"
 	"swisstronik/docs"
 	"swisstronik/encoding"
-	"swisstronik/ethereum/eip712"
 	srvflags "swisstronik/server/flags"
 	evmcommontypes "swisstronik/types"
 	compliancemodule "swisstronik/x/compliance"
@@ -304,8 +303,6 @@ func New(
 	cdc := encodingConfig.Amino
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 
-	eip712.SetEncodingConfig(encodingConfig)
-
 	// Setup Mempool and Proposal Handlers
 	baseAppOptions = append(baseAppOptions, func(app *baseapp.BaseApp) {
 		mempool := mempool.NoOpMempool{}