Merge pull request #172 from ewasm/evmc-migration

Migrate to EVMC

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "evmc"]
+	path = evmc
+	url = https://github.com/ethereum/evmc

CMakeLists.txt

@@ -13,4 +13,7 @@ project(hera)
 
 include(ProjectBinaryen)
 
+option(EVMC_BUILD_EXAMPLES "Build EVMC examples" OFF)
+add_subdirectory(evmc)
+
 add_subdirectory(src)

README.md

@@ -1,10 +1,10 @@
 # Hera
 
-Hera is an [eWASM](https://github.com/ewasm/design) virtual machine implemented in C++ conforming to the [Ethereum VM API](https://github.com/ethereum/EIPs/issues/56).
+Hera is an [ewasm](https://github.com/ewasm/design) virtual machine implemented in C++ conforming to [EVMC](https://github.com/ethereum/evmc/).
 
 It can be used with [cpp-ethereum](https://github.com/ethereum/cpp-ethereum) and perhaps in the future with other implementations through appropriate bindings.
 
-Currently it uses [Binaryen](https://github.com/webassembly/binaryen)'s interpreter for running WebAssembly bytecode and it should be improved to support the [WAVM](https://github.com/AndrewScheidecker/WAVM) as a backend.
+Currently it uses [Binaryen](https://github.com/webassembly/binaryen)'s interpreter for running WebAssembly bytecode and it should be improved to support [wabt](https://github.com/webassembly/wabt) and [wavm](https://github.com/AndrewScheidecker/WAVM) as backends.
 
 ## Build options
 

circle.yml

@@ -45,7 +45,7 @@ defaults:
 
   save-eth-cache: &save-eth-cache
     save_cache:
-      key: &eth-cache-key cpp-prebuilt-cache-{{arch}}-{{checksum "compiler.version"}}-ee0c6776c01b09045a379220c7e490000dae9377
+      key: &eth-cache-key cpp-prebuilt-cache-{{arch}}-{{checksum "compiler.version"}}-a17f30a41aa2af506b6b453f052c53bd323a36e0
       paths:
         - ~/build
         - ~/.hunter
@@ -62,7 +62,7 @@ defaults:
         cd ..
         git clone https://github.com/ethereum/cpp-ethereum --branch develop --single-branch
         cd cpp-ethereum
-        git reset --hard ee0c6776c01b09045a379220c7e490000dae9377
+        git reset --hard a17f30a41aa2af506b6b453f052c53bd323a36e0
         git submodule update --init
 
   link-hera: &link-hera
@@ -134,6 +134,7 @@ jobs:
       - image: ethereum/cpp-build-env
     steps:
       - checkout
+      - *update-submodules
       - *environment-info
       - *checkout-cpp-eth
       - *restore-eth-cache