Merge pull request #201 from lrettig/cpp-implementation

Cpp implementation

Author: axic

CMakeLists.txt

@@ -9,6 +9,12 @@ set(CMAKE_CXX_EXTENSIONS Off)
 
 add_compile_options(-Wall -Wextra -Wconversion -Wno-sign-conversion -Wno-unknown-pragmas)
 
+include(HunterGate)
+HunterGate(
+    URL "https://github.com/ruslo/hunter/archive/v0.20.24.tar.gz"
+    SHA1 "3e2037a462bcf2ec3440f60298d933e74ffd4df3"
+)
+
 project(evm2wasm)
 
 include(ProjectBinaryen)

README.md

@@ -36,12 +36,20 @@ $ bin/evm2wasm.js -e `evm_bytecode_file` -o `wasm_output_file` --wast --charge-p
 * To lint run `npm run lint`
 * And make sure you test with `npm test` and `npm run vmTests` which runs the offical Ethereum test suite
 
-The above build command will invoke `wasm/generateInterface.js` which generates `wasm/wast.json` containing a
+The above build command will invoke `wasm/generateInterface.js` which generates `wasm/wast.json` and `include/wast.h` containing a
 Webassembly function corresponding to each EVM opcode.
 
-The core logic of the evm2wasm compiler is in `index.js`, which iterates the input EMV bytecode and generates
+The core logic of the evm2wasm compiler is in `index.js` (Javascript frontend) or `libs/evm2wasm/evm2wasm.cpp` (C++ fronetend), which iterates the input EMV bytecode and generates
 a Webassembly output by invoking each of the above generated Webassembly functions and concatenating them into the output.
 
+To build the C++ frontend:
+```
+$ mkdir build
+$ cd build
+$ cmake ..
+$ make
+```
+
 # API
 [./docs/](./docs/index.md)
 

circle.yml

@@ -27,17 +27,32 @@ defaults:
 
   build-hera: &build-hera
     run: 
-      name: "build hera"
+      name: "Build hera"
       working_directory: ~
       command: |
         git clone https://github.com/ewasm/hera
         cd hera
-        git reset 817d85bb4f09d24f11ddfc67bcc548032f708cfc --hard
+        git reset ef3c17f3d4fec8abb6d2901bc363a7461fa1a9d9 --hard
         git submodule update --init --recursive
         cmake -DBUILD_SHARED_LIBS=ON .
         make -j8
         mv ~/evm2wasm/hera/src/libhera.so ~/libhera.so
 
+  build-hera-cpp: &build-hera-cpp
+    run: 
+      name: "Build hera (with builtin evm2wasm)"
+      working_directory: ~
+      command: |
+        git clone https://github.com/ewasm/hera
+        cd hera
+        git reset ef3c17f3d4fec8abb6d2901bc363a7461fa1a9d9 --hard
+        git submodule update --init --recursive
+        rm -rf evm2wasm
+        ln -s /home/builder/evm2wasm evm2wasm
+        cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=evm2wasm/cmake/toolchains/cxx11-pic.cmake .
+        make -j8
+        mv ~/evm2wasm/hera/src/libhera.so ~/libhera.so
+
   vm-tests: &vm-tests
     run:
       name: "Run ethereum VM tests"
@@ -76,6 +91,22 @@ defaults:
         testeth -t GeneralStateTests/stMemoryTest -- --testpath ~/tests --singlenet "Byzantium" --singletest "memReturn" --vm ~/libhera.so --evmc evm2wasm.js=true
         echo "ran the state tests."
 
+  state-tests: &state-tests-cpp
+    run:
+      name: "Run Ethereum state tests"
+      working_directory: ~/build
+      command: |
+        echo 'export PATH=~/evm2wasm/bin:$PATH' >> $BASH_ENV
+        source $BASH_ENV
+        echo "running testeth command..."
+        testeth -t GeneralStateTests/stExample -- --testpath ~/tests --singlenet "Byzantium" --singletest "add11" --vm ~/libhera.so --evmc evm2wasm.cpp=true
+        #testeth -t GeneralStateTests/stStackTests -- --testpath ~/tests --singlenet "Byzantium" --vm ~/libhera.so --evmc evm2wasm.cpp=true
+        testeth -t GeneralStateTests/stBadOpcode -- --testpath ~/tests --singlenet "Byzantium" --vm ~/libhera.so --evmc evm2wasm.cpp=true
+        testeth -t GeneralStateTests/stCallCodes -- --testpath ~/tests --singlenet "Byzantium" --singletest "callcall_00" --vm ~/libhera.so --evmc evm2wasm.cpp=true
+        testeth -t GeneralStateTests/stCallCodes -- --testpath ~/tests --singlenet "Byzantium" --singletest "callcallcode_01" --vm ~/libhera.so --evmc evm2wasm.cpp=true
+        testeth -t GeneralStateTests/stMemoryTest -- --testpath ~/tests --singlenet "Byzantium" --singletest "memReturn" --vm ~/libhera.so --evmc evm2wasm.cpp=true
+        echo "ran the state tests."
+
   cli-tests: &cli-tests
     run:
       name: "Basic CLI validation"
@@ -84,7 +115,7 @@ defaults:
         bin/evm2wasm.js 600160020200 --trace
         build/tools/evm2wasm/evm2wasm <(echo "600160020200")
 
-  state-test-steps: &state-test-steps
+  js-state-test-steps: &js-state-test-steps
     - checkout
     - *npm-install
     - *lint
@@ -99,17 +130,39 @@ defaults:
     # - *store-hera
     - *state-tests
 
+  cpp-state-test-steps: &cpp-state-test-steps
+    - checkout
+    - *npm-install
+    - *lint
+    - *validate-build
+    - *clone-tests
+    #- *build-cpp
+    #- *cli-tests # weird chars mess up the console
+    #- *vm-tests # vm-tests temporarily disabled until ewasm-kernel is fixed
+    # - *print-cpp-hera-version
+    - *install-cpp-ethereum
+    - *build-hera-cpp
+    # - *store-hera
+    - *state-tests-cpp
+
 version: 2
 jobs:
   # to run this using local circleci tool, rename Ewasm-Tests to `build` then do `circleci build -c circle.yml`
-  build:
+  build-js:
+    working_directory: ~/evm2wasm
+    docker:
+      - image: cdetrio/nodejs-cpp-build-env
+    steps: *js-state-test-steps
+
+  build-cpp:
     working_directory: ~/evm2wasm
     docker:
       - image: cdetrio/nodejs-cpp-build-env
-    steps: *state-test-steps
+    steps: *cpp-state-test-steps
 
 workflows:
   version: 2
   evm2wasm-build:
     jobs:
-       - build
+       - build-js
+       - build-cpp