Problem: no proper error msg for unsupported opcode

CHANGELOG.md

@@ -43,6 +43,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - (feemarket) [#433](https://github.com/crypto-org-chain/ethermint/pull/433) Fix sdk int conversion panic with baseFee.
 * (rpc) [#434](https://github.com/crypto-org-chain/ethermint/pull/434) No need gasPrice when patch gasUsed for `eth_getTransactionReceipt`.
 * (rpc) [#439](https://github.com/crypto-org-chain/ethermint/pull/439), [#441](https://github.com/crypto-org-chain/ethermint/pull/441) Align trace response for failed tx with go-ethereum.
+* (rpc) [#443](https://github.com/crypto-org-chain/ethermint/pull/443) Return proper error msg for unsupported opcode.
 
 ### Features
 

tests/integration_tests/hardhat/contracts/Random.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+contract Random {
+    function randomTokenId() public returns (uint256) {
+        return uint256(keccak256(abi.encodePacked(block.prevrandao)));
+    }
+}

tests/integration_tests/hardhat/hardhat.config.ts

@@ -6,6 +6,15 @@ import "@nomiclabs/hardhat-ethers";
 const config: HardhatUserConfig = {
   solidity: {
     compilers: [
+      {
+        version: "0.8.21",
+        settings: {
+          optimizer: {
+            enabled: true
+          },
+          evmVersion: "shanghai"
+        }
+      },
       {
         version: "0.8.10",
         settings: {

tests/integration_tests/test_call.py

@@ -1,5 +1,6 @@
 import json
 
+import pytest
 from hexbytes import HexBytes
 from web3 import Web3
 from web3._utils.contracts import encode_transaction_data
@@ -93,3 +94,13 @@ def test_override_state(ethermint):
         },
     )
     assert ("",) == w3.codec.decode(("string",), result)
+
+
+def test_opcode(ethermint):
+    contract, _ = deploy_contract(
+        ethermint.w3,
+        CONTRACTS["Random"],
+    )
+    with pytest.raises(ValueError) as e_info:
+        contract.caller.randomTokenId()
+    assert "RANDOM opcode is currently not supported" in str(e_info.value)

tests/integration_tests/utils.py

@@ -40,6 +40,7 @@
     "TestMessageCall": "TestMessageCall.sol",
     "Calculator": "Calculator.sol",
     "Caller": "Caller.sol",
+    "Random": "Random.sol",
 }
 
 

x/evm/keeper/state_transition.go

@@ -341,7 +341,7 @@ func (k *Keeper) ApplyMessageWithConfig(
 	msg core.Message,
 	cfg *EVMConfig,
 	commit bool,
-) (*types.MsgEthereumTxResponse, error) {
+) (res *types.MsgEthereumTxResponse, err error) {
 	var (
 		ret   []byte // return bytes from evm execution
 		vmErr error  // vm errors do not effect consensus and are therefore not assigned to err
@@ -362,6 +362,16 @@ func (k *Keeper) ApplyMessageWithConfig(
 		}
 	}
 	evm = k.NewEVM(ctx, msg, cfg, stateDB)
+	defer func() {
+		if e := recover(); e != nil {
+			if evm.Context.Random == nil {
+				k.Logger(ctx).Error("panic", "error", e)
+				err = fmt.Errorf("RANDOM opcode is currently not supported")
+			} else {
+				panic(e)
+			}
+		}
+	}()
 	leftoverGas := msg.GasLimit
 	sender := vm.AccountRef(msg.From)
 	// Allow the tracer captures the tx level events, mainly the gas consumption.