Remove support for C++/Javascript version of evm2wasm

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "evmc"]
 	path = evmc
 	url = https://github.com/ethereum/evmc
-[submodule "evm2wasm"]
-	path = evm2wasm
-	url = https://github.com/ewasm/evm2wasm
 [submodule "cable"]
 	path = cmake/cable
 	url = https://github.com/ethereum/cable

CMakeLists.txt

@@ -12,18 +12,16 @@ include(CableToolchains)
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
+option(EVMC_TESTING "Build EVMC tests and test tools" OFF)
+if(EVMC_TESTING)
+    # If Hunter is needed it must be initialized before project(hera).
+    include(evmc/cmake/cable/HunterGate.cmake)
+    include(evmc/cmake/HunterConfig.cmake)
+endif()
+
 cable_configure_toolchain(DEFAULT cxx11-pic)
 
 set(CMAKE_DEBUG_POSTFIX "")
-set(HUNTER_CONFIGURATION_TYPES Release CACHE STRING "Build type of the 3rd party packages")
-
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/evm2wasm/cmake/HunterGate.cmake)
-    include(evm2wasm/cmake/HunterGate.cmake)
-    HunterGate(
-        URL "https://github.com/ruslo/hunter/archive/v0.21.19.tar.gz"
-        SHA1 "5ead1e069b437930d0de8a21824b20fb52b37b50"
-    )
-endif()
 
 project(hera)
 set(PROJECT_VERSION 0.2.0)
@@ -53,7 +51,6 @@ if (HERA_WAVM)
 endif()
 
 add_subdirectory(evmc)
-add_subdirectory(evm2wasm)
 add_subdirectory(src)
 
 

README.md

@@ -72,10 +72,6 @@ These are to be used via EVMC `set_option`:
 - `reject` will reject any EVM1 bytecode with an error (the default setting)
 - `fallback` will allow EVM1 bytecode to be passed through to the client for execution
 - `evm2wasm` will enable transformation of bytecode using the [EVM Transcompiler]
-- `evm2wasm.js` will use a `evm2wasm.js` as an external commandline tool instead of the system contract
-- `evm2wasm.js-trace` will use `evm2wasm.js` with tracing option turned on
-- `evm2wasm.cpp` will use a `evm2wasm` as a compiled-in dependency instead of the system contract
-- `evm2wasm.cpp-trace` will turn use `evm2wasm` with tracing option turned on
 
 ## Interfaces
 

circle.yml

@@ -24,7 +24,7 @@ defaults:
       # (ninja is using relative paths otherwise).
       working_directory: ~/build
       command: |
-        cmake ../project -G "$GENERATOR" -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CMAKE_OPTIONS -DEVM2WASM_TOOLS=OFF
+        cmake ../project -G "$GENERATOR" -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CMAKE_OPTIONS
 
   codespell: &codespell
     run:
@@ -58,7 +58,7 @@ defaults:
   save-deps-cache: &save-deps-cache
     cache-save:
       name: "Save dependencies cache"
-      key: &deps-cache-key deps-4-{{arch}}-{{checksum "toolchain"}}-{{checksum "cmake/ProjectBinaryen.cmake"}}
+      key: &deps-cache-key deps-5-{{arch}}-{{checksum "toolchain"}}-{{checksum "cmake/ProjectBinaryen.cmake"}}
       paths:
         - ~/build/deps
 
@@ -176,14 +176,14 @@ defaults:
       command: |
         ~/build/evmc/test/evmc-vmtester ~/build/src/libhera.so
 
-  evm2wasm-test: &evm2wasm-test
-    run:
-      name: "Run evm2wasm state tests"
-      command: |
-        if [[ $PRELOAD_ASAN ]]; then export LD_PRELOAD=/usr/lib/clang/6.0/lib/linux/libclang_rt.asan-x86_64.so; fi
-        testeth --version
-        testeth -t GeneralStateTests/stExample -- --testpath tests --vm ~/build/src/libhera.so --singlenet Byzantium --singletest "add11" --evmc evm1mode=evm2wasm.cpp
-        testeth -t GeneralStateTests/stStackTests -- --testpath tests --vm ~/build/src/libhera.so --singlenet Byzantium --evmc evm1mode=evm2wasm.cpp
+#  evm2wasm-test: &evm2wasm-test
+#    run:
+#      name: "Run evm2wasm state tests"
+#      command: |
+#        if [[ $PRELOAD_ASAN ]]; then export LD_PRELOAD=/usr/lib/clang/6.0/lib/linux/libclang_rt.asan-x86_64.so; fi
+#        testeth --version
+#        testeth -t GeneralStateTests/stExample -- --testpath tests --vm ~/build/src/libhera.so --singlenet Byzantium --singletest "add11" --evmc evm1mode=evm2wasm.cpp
+#        testeth -t GeneralStateTests/stStackTests -- --testpath tests --vm ~/build/src/libhera.so --singlenet Byzantium --evmc evm1mode=evm2wasm.cpp
 
   upload-coverage-data: &upload-coverage-data
     run:
@@ -220,7 +220,7 @@ jobs:
       - *test-wabt
       - *test-wavm
       - *evmc-test
-      - *evm2wasm-test
+#      - *evm2wasm-test
 
   linux-clang-shared-asan:
     environment:
@@ -250,7 +250,7 @@ jobs:
       - *test-wabt
       - *test-wavm
       - *evmc-test
-      - *evm2wasm-test
+#      - *evm2wasm-test
 
   linux-gcc-shared-coverage:
     environment:

src/CMakeLists.txt

@@ -31,7 +31,7 @@ endif()
 target_include_directories(hera
     PUBLIC $<BUILD_INTERFACE:${hera_include_dir}>$<INSTALL_INTERFACE:include>
     PRIVATE ${evmc_include_dir})
-target_link_libraries(hera PRIVATE hera-buildinfo evmc::evmc evmc::instructions libevm2wasm binaryen::binaryen Threads::Threads)
+target_link_libraries(hera PRIVATE hera-buildinfo evmc::evmc evmc::instructions binaryen::binaryen Threads::Threads)
 if(NOT WIN32)
   if(CMAKE_COMPILER_IS_GNUCXX)
     set_target_properties(hera PROPERTIES LINK_FLAGS "-Wl,--no-undefined")

src/hera.cpp

@@ -23,11 +23,10 @@
 #include <iostream>
 #include <fstream>
 #include <iomanip>
+#include <map>
 
 #include <evmc/evmc.h>
 
-#include <evm2wasm.h>
-
 #include "binaryen.h"
 #include "debugging.h"
 #include "eei.h"
@@ -60,10 +59,6 @@ enum class hera_evm1mode {
   reject,
   fallback,
   evm2wasm_contract,
-  evm2wasm_cpp,
-  evm2wasm_cpp_tracing,
-  evm2wasm_js,
-  evm2wasm_js_tracing
 };
 
 using WasmEngineCreateFn = unique_ptr<WasmEngine>(*)();
@@ -82,10 +77,6 @@ const map<string, hera_evm1mode> evm1mode_options {
   { "reject", hera_evm1mode::reject },
   { "fallback", hera_evm1mode::fallback },
   { "evm2wasm", hera_evm1mode::evm2wasm_contract },
-  { "evm2wasm.cpp", hera_evm1mode::evm2wasm_cpp },
-  { "evm2wasm.cpp-trace", hera_evm1mode::evm2wasm_cpp_tracing },
-  { "evm2wasm.js", hera_evm1mode::evm2wasm_js },
-  { "evm2wasm.js-trace", hera_evm1mode::evm2wasm_js_tracing },
 };
 
 struct hera_instance : evmc_instance {
@@ -165,72 +156,6 @@ vector<uint8_t> sentinel(evmc_context* context, vector<uint8_t> const& input)
   return ret;
 }
 
-// NOTE: assumes that pattern doesn't contain any formatting characters (e.g. %)
-string mktemp_string(string pattern) {
-  const unsigned long len = pattern.size();
-  char tmp[len + 1];
-  strcpy(tmp, pattern.data());
-  if (!mktemp(tmp) || (tmp[0] == 0))
-     return string();
-  return string(tmp, strlen(tmp));
-}
-
-// Calls evm2wasm (as a Javascript CLI) with input data @input.
-// @returns the compiled output or empty output otherwise.
-vector<uint8_t> evm2wasm_js(vector<uint8_t> const& input, bool evmTrace) {
-  HERA_DEBUG << "Calling evm2wasm.js (input " << input.size() << " bytes)...\n";
-
-  string fileEVM = mktemp_string("/tmp/hera.evm2wasm.evm.XXXXXX");
-  string fileWASM = mktemp_string("/tmp/hera.evm2wasm.wasm.XXXXXX");
-
-  if (fileEVM.size() == 0 || fileWASM.size() == 0)
-    return vector<uint8_t>();
-
-  ofstream os;
-  os.open(fileEVM);
-  // print as a hex string
-  os << hex;
-  for (uint8_t byte: input)
-    os << setfill('0') << setw(2) << static_cast<int>(byte);
-  os.close();
-
-  string cmd = string("evm2wasm.js ") + "-e " + fileEVM + " -o " + fileWASM + " --charge-per-op";
-  if (evmTrace)
-    cmd += " --trace";
-
-  HERA_DEBUG << "(Calling evm2wasm.js with command: " << cmd << ")\n";
-
-  int ret = system(cmd.data());
-  unlink(fileEVM.data());
-
-  if (ret != 0) {
-    HERA_DEBUG << "evm2wasm.js failed\n";
-
-    unlink(fileWASM.data());
-    return vector<uint8_t>();
-  }
-
-  string str = loadFileContents(fileWASM);
-
-  unlink(fileWASM.data());
-
-  HERA_DEBUG << "evm2wasm.js done (output " << str.length() << " bytes)\n";
-
-  return vector<uint8_t>(str.begin(), str.end());
-}
-
-// Calls evm2wasm (through the built-in C++ interface) with input data @input.
-// @returns the compiled output or empty output otherwise.
-vector<uint8_t> evm2wasm_cpp(vector<uint8_t> const& input, bool evmTrace) {
-  HERA_DEBUG << "Calling evm2wasm.cpp (input " << input.size() << " bytes)...\n";
-
-  string str = evm2wasm::evm2wasm(input, evmTrace);
-
-  HERA_DEBUG << "evm2wasm.cpp done (output " << str.length() << " bytes)\n";
-
-  return vector<uint8_t>(str.begin(), str.end());
-}
-
 // Calls the evm2wasm contract with input data @input.
 // @returns the compiled output or empty output otherwise.
 vector<uint8_t> evm2wasm(evmc_context* context, vector<uint8_t> const& input) {
@@ -303,20 +228,6 @@ evmc_result hera_execute(
         // TODO: enable this once evm2wasm does metering of interfaces
         // meterInterfaceGas = false;
         break;
-      case hera_evm1mode::evm2wasm_cpp:
-      case hera_evm1mode::evm2wasm_cpp_tracing:
-        run_code = evm2wasm_cpp(run_code, hera->evm1mode == hera_evm1mode::evm2wasm_cpp_tracing);
-        ensureCondition(run_code.size() > 8, ContractValidationFailure, "Transcompiling via evm2wasm.cpp failed");
-        // TODO: enable this once evm2wasm does metering of interfaces
-        // meterInterfaceGas = false;
-        break;
-      case hera_evm1mode::evm2wasm_js:
-      case hera_evm1mode::evm2wasm_js_tracing:
-        run_code = evm2wasm_js(run_code, hera->evm1mode == hera_evm1mode::evm2wasm_js_tracing);
-        ensureCondition(run_code.size() > 8, ContractValidationFailure, "Transcompiling via evm2wasm.js failed");
-        // TODO: enable this once evm2wasm does metering of interfaces
-        // meterInterfaceGas = false;
-        break;
       case hera_evm1mode::fallback:
         HERA_DEBUG << "Non-WebAssembly input, but fallback mode enabled, asking client to deal with it.\n";
         ret.status_code = EVMC_REJECTED;