fix ConvertCosmosTxToEthereumTx to properly check type url

Author: beer-1

x/evm/keeper/txutils.go

@@ -195,6 +195,12 @@ func (u *TxUtils) ConvertCosmosTxToEthereumTx(ctx context.Context, sdkTx sdk.Tx)
 		return nil, nil, nil
 	}
 
+	msg := msgs[0]
+	typeUrl := sdk.MsgTypeURL(msg)
+	if typeUrl != "/minievm.evm.v1.MsgCall" && typeUrl != "/minievm.evm.v1.MsgCreate" {
+		return nil, nil, nil
+	}
+
 	authTx := sdkTx.(authsigning.Tx)
 	memo := authTx.GetMemo()
 	if len(memo) == 0 {
@@ -231,10 +237,6 @@ func (u *TxUtils) ConvertCosmosTxToEthereumTx(ctx context.Context, sdkTx sdk.Tx)
 
 	var tx *coretypes.Transaction
 
-	msg := msgs[0]
-	gas := authTx.GetGas()
-	typeUrl := sdk.MsgTypeURL(msg)
-
 	sig := sigs[0]
 	cosmosSender := sig.PubKey.Address()
 	if len(cosmosSender.Bytes()) != common.AddressLength {
@@ -272,6 +274,7 @@ func (u *TxUtils) ConvertCosmosTxToEthereumTx(ctx context.Context, sdkTx sdk.Tx)
 	}
 
 	// check if the fee amount is correctly converted
+	gas := authTx.GetGas()
 	computedFeeAmount := sdk.NewCoins(sdk.NewCoin(params.FeeDenom, math.NewIntFromBigInt(computeGasFeeAmount(gasFeeCap, gas, decimals))))
 	if !feeAmount.Equal(computedFeeAmount) {
 		u.Logger(ctx).Error("fee amount manipulation detected", "expected", computedFeeAmount, "actual", feeAmount)
@@ -315,9 +318,6 @@ func (u *TxUtils) ConvertCosmosTxToEthereumTx(ctx context.Context, sdkTx sdk.Tx)
 		// Same as above (MsgCall)
 		value = types.ToEthersUnit(decimals, createMsg.Value.BigInt())
 		accessList = types.ConvertCosmosAccessListToEth(createMsg.AccessList)
-	case "/minievm.evm.v1.MsgCreate2":
-		// create2 is not supported
-		return nil, nil, nil
 	}
 
 	chainID := sdk.UnwrapSDKContext(ctx).ChainID()

x/evm/keeper/txutils_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -477,7 +478,21 @@ func Test_IsEthereumTx(t *testing.T) {
 	require.NoError(t, err)
 	require.False(t, ok)
 
-	// 4. wrong signature type
+	// 4. wrong cosmos type
+	txBuilder.SetMsgs(&banktypes.MsgMultiSend{})
+	txBuilder.SetMemo("{}")
+	txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(100))))
+	tx = txBuilder.GetTx()
+
+	ok, err = input.EVMKeeper.TxUtils().IsEthereumTx(ctx, tx)
+	require.NoError(t, err)
+	require.False(t, ok)
+
+	ethTx, _, err := input.EVMKeeper.TxUtils().ConvertCosmosTxToEthereumTx(ctx, tx)
+	require.NoError(t, err)
+	require.Nil(t, ethTx)
+
+	// 5. wrong signature type
 	txBuilder.SetMsgs(&types.MsgCreate{})
 	txBuilder.SetMemo("{}")
 	txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(100))))