From 1bf6dea8ff2bdc4761022d4e0fb1015b991fab5a Mon Sep 17 00:00:00 2001
From: Dmytro Kostenko <kostello.d@gmail.com>
Date: Thu, 6 Apr 2023 18:35:31 +0200
Subject: [PATCH] fix: add revert reason to execution error

---
 submodules/taraxa-evm                         |  2 +-
 tests/final_chain_test.cpp                    | 48 ++++++++++++++++++-
 tests/rpc_test.cpp                            |  7 ---
 .../test_util/include/test_util/test_util.hpp |  8 ++++
 4 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/submodules/taraxa-evm b/submodules/taraxa-evm
index cc8639e427..4a1e215d42 160000
--- a/submodules/taraxa-evm
+++ b/submodules/taraxa-evm
@@ -1 +1 @@
-Subproject commit cc8639e4275171fd5804986d1705256d5b736df4
+Subproject commit 4a1e215d426204d1bce525e67a25f1b9cd9c3fbb
diff --git a/tests/final_chain_test.cpp b/tests/final_chain_test.cpp
index daaa0b45b9..70e899a6dc 100644
--- a/tests/final_chain_test.cpp
+++ b/tests/final_chain_test.cpp
@@ -7,6 +7,8 @@
 #include "common/vrf_wrapper.hpp"
 #include "config/config.hpp"
 #include "final_chain/trie_common.hpp"
+#include "libdevcore/CommonJS.h"
+#include "network/rpc/eth/Eth.h"
 #include "test_util/gtest.hpp"
 #include "test_util/samples.hpp"
 #include "test_util/test_util.hpp"
@@ -42,8 +44,6 @@ struct FinalChainTest : WithDataDir {
   }
 
   auto advance(const SharedTransactions& trxs, advance_check_opts opts = {}) {
-    SUT = nullptr;
-    SUT = NewFinalChain(db, cfg);
     std::vector<h256> trx_hashes;
     ++expected_blk_num;
     for (const auto& trx : trxs) {
@@ -473,6 +473,50 @@ TEST_F(FinalChainTest, failed_transaction_fee) {
   }
 }
 
+TEST_F(FinalChainTest, revert_reason) {
+  const auto test_contract_code =
+      "608060405234801561001057600080fd5b506101ac806100206000396000f3fe608060405234801561001057600080fd5b50600436106100"
+      "2b5760003560e01c806336091dff14610030575b600080fd5b61004a600480360381019061004591906100cc565b61004c565b005b806100"
+      "8c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161008390610156565b60405180"
+      "910390fd5b50565b600080fd5b60008115159050919050565b6100a981610094565b81146100b457600080fd5b50565b6000813590506100"
+      "c6816100a0565b92915050565b6000602082840312156100e2576100e161008f565b5b60006100f0848285016100b7565b91505092915050"
+      "565b600082825260208201905092915050565b7f617267207265717569726564000000000000000000000000000000000000000060008201"
+      "5250565b6000610140600c836100f9565b915061014b8261010a565b602082019050919050565b6000602082019050818103600083015261"
+      "016f81610133565b905091905056fea2646970667358221220846c5a92aab30dade0d92661a25b1fd6ba9a914fd114f2f264c2003b5abdda"
+      "db64736f6c63430008120033";
+  auto sender_keys = dev::KeyPair::create();
+  const auto& from = sender_keys.address();
+  const auto& sk = sender_keys.secret();
+  cfg.genesis.state.initial_balances = {};
+  cfg.genesis.state.initial_balances[from] = u256("10000000000000000000000");
+  // disable balances check as we have internal transfer
+  assume_only_toplevel_transfers = false;
+  init();
+
+  net::rpc::eth::EthParams eth_rpc_params;
+  eth_rpc_params.chain_id = cfg.genesis.chain_id;
+  eth_rpc_params.gas_limit = cfg.genesis.dag.gas_limit;
+  eth_rpc_params.final_chain = SUT;
+  auto eth_json_rpc = net::rpc::eth::NewEth(std::move(eth_rpc_params));
+
+  auto nonce = 0;
+  auto trx1 = std::make_shared<Transaction>(nonce++, 0, 0, TEST_TX_GAS_LIMIT, dev::fromHex(test_contract_code), sk);
+  auto result = advance({trx1});
+  auto test_contract_addr = result->trx_receipts[0].new_contract_address;
+  EXPECT_EQ(test_contract_addr, dev::right160(dev::sha3(dev::rlpList(from, 0))));
+  auto call_data = "0x36091dff0000000000000000000000000000000000000000000000000000000000000000";
+  {
+    Json::Value est(Json::objectValue);
+    est["to"] = dev::toHex(*test_contract_addr);
+    est["from"] = dev::toHex(from);
+    est["data"] = call_data;
+    EXPECT_THROW_WITH(dev::jsToInt(eth_json_rpc->eth_estimateGas(est)), std::exception,
+                      "evm: execution reverted: arg required");
+    EXPECT_THROW_WITH(eth_json_rpc->eth_call(est, "latest"), std::exception, "evm: execution reverted: arg required");
+  }
+}
+
+// This test should be last as state_api isn't destructed correctly because of exception
 TEST_F(FinalChainTest, initial_validator_exceed_maximum_stake) {
   const dev::KeyPair key = dev::KeyPair::create();
   const dev::KeyPair validator_key = dev::KeyPair::create();
diff --git a/tests/rpc_test.cpp b/tests/rpc_test.cpp
index a104432dfb..a4ea10b90a 100644
--- a/tests/rpc_test.cpp
+++ b/tests/rpc_test.cpp
@@ -58,13 +58,6 @@ TEST_F(RPCTest, eth_estimateGas) {
   }
 }
 
-#define EXPECT_THROW_WITH(statement, expected_exception, msg) \
-  try {                                                       \
-    statement;                                                \
-  } catch (const expected_exception& e) {                     \
-    ASSERT_EQ(std::string(msg), std::string(e.what()));       \
-  }
-
 TEST_F(RPCTest, eth_call) {
   auto node_cfg = make_node_cfgs(1);
   auto nodes = launch_nodes(node_cfg);
diff --git a/tests/test_util/include/test_util/test_util.hpp b/tests/test_util/include/test_util/test_util.hpp
index ab6a4b3731..cdbd8659dc 100644
--- a/tests/test_util/include/test_util/test_util.hpp
+++ b/tests/test_util/include/test_util/test_util.hpp
@@ -122,6 +122,14 @@ bool wait(const wait_opts& opts, const std::function<void(wait_ctx&)>& poller);
     EXPECT_GE(o1, o2);                      \
   }
 
+#define EXPECT_THROW_WITH(statement, expected_exception, msg) \
+  try {                                                       \
+    statement;                                                \
+    EXPECT_TRUE("No exception thrown" && false);              \
+  } catch (const expected_exception& e) {                     \
+    EXPECT_EQ(std::string(msg), std::string(e.what()));       \
+  }
+
 struct TransactionClient {
   enum class TransactionStage {
     created,