deal with other evm errors

ethereum/rpc/namespaces/eth/api.go

@@ -5,6 +5,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	"math/big"
 	"strings"
 
@@ -560,7 +563,10 @@ func (e *PublicAPI) doCall(
 	}
 
 	if res.Failed() {
-		return nil, evmtypes.NewExecErrorWithReason(res.Ret, res.VmError)
+		if res.VmError != vm.ErrExecutionReverted.Error() {
+			return nil, status.Error(codes.Internal, res.VmError)
+		}
+		return nil, evmtypes.NewExecErrorWithReason(res.Ret)
 	}
 
 	return res, nil

x/evm/keeper/grpc_query.go

@@ -491,8 +491,8 @@ func (k Keeper) EstimateGas(c context.Context, req *types.EthCallRequest) (*type
 		}
 		if failed {
 			if result != nil && result.VmError != vm.ErrOutOfGas.Error() {
-				if result.Failed() {
-					return nil, evmtypes.NewExecErrorWithReason(result.Ret, result.VmError)
+				if result.VmError == vm.ErrExecutionReverted.Error() {
+					return nil, evmtypes.NewExecErrorWithReason(result.Ret)
 				}
 				return nil, status.Error(codes.Internal, result.VmError)
 			}

x/evm/types/errors.go

@@ -78,13 +78,8 @@ var (
 
 // NewExecErrorWithReason unpacks the revert return bytes and returns a wrapped error
 // with the return reason.
-func NewExecErrorWithReason(revertReason []byte, vmError string) *revertError {
-	var result []byte
-	result = nil
-	if vmError == vm.ErrExecutionReverted.Error() {
-		result = common.CopyBytes(revertReason)
-	}
-
+func NewExecErrorWithReason(revertReason []byte) *revertError {
+	var result = common.CopyBytes(revertReason)
 	reason, errUnpack := abi.UnpackRevert(result)
 	err := errors.New("execution reverted")
 	if errUnpack == nil {