Merge next to master

.github/workflows/rust.yml

@@ -2,9 +2,9 @@ name: Rust
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, next ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, next ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -16,32 +16,34 @@ jobs:
     - uses: actions/checkout@v2
     - name: Rustfmt
       run: cargo fmt --all -- --check
-    - name: Clippy
-      run: cargo clippy --all
   build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Build
       run: cargo build --verbose
-    - name: Build for feature (tracing)
-      run: cargo build --features tracing --verbose
     - name: Run tests
       run: cargo test --verbose
   jsontests:
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v2
     - uses: actions/checkout@v2
       with:
-        repository: "rust-blockchain/evm-tests"
-        submodules: recursive
-    - name: Submodules
-      run: |
-        cd evm
-        git remote set-url origin "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
-        git fetch origin $GITHUB_SHA
-        git checkout $GITHUB_SHA
+        path: jsontests/res/ethtests
+        repository: ethereum/tests
+        ref: 428f218d7d6f4a52544e12684afbfe6e2882ffbf
     - name: Run tests
       run: |
-        cd jsontests
-        cargo test --release --verbose
+        cargo run --release --verbose -p jsontests -- \
+        jsontests/res/ethtests/GeneralStateTests/stArgsZeroOneBalance/ \
+        jsontests/res/ethtests/GeneralStateTests/stCodeCopyTest/ \
+        jsontests/res/ethtests/GeneralStateTests/stExample/ \
+        jsontests/res/ethtests/GeneralStateTests/stSelfBalance \
+        jsontests/res/ethtests/GeneralStateTests/stSLoadTest/ \
+        jsontests/res/ethtests/GeneralStateTests/VMTests/vmArithmeticTest/ \
+        jsontests/res/ethtests/GeneralStateTests/VMTests/vmBitwiseLogicOperation/ \
+        jsontests/res/ethtests/GeneralStateTests/VMTests/vmIOandFlowOperations/ \
+        jsontests/res/ethtests/GeneralStateTests/VMTests/vmLogTest/ \
+        jsontests/res/ethtests/GeneralStateTests/VMTests/vmTests/
+

.gitignore

@@ -9,4 +9,6 @@
 target
 **/result
 tests.bin
-Cargo.lock
+Cargo.lock
+perf.data
+perf.data.old

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "evm"
-version = "0.41.0"
+version = "0.40.0"
 license = "Apache-2.0"
 authors = ["Wei Tang <[email protected]>", "Parity Technologies <[email protected]>"]
 description = "SputnikVM - a Portable Blockchain Virtual Machine"
@@ -10,7 +10,7 @@ edition = "2018"
 
 [dependencies]
 auto_impl = "1.0"
-ethereum = { version = "0.15", default-features = false }
+ethereum = { version = "0.14", default-features = false }
 log = { version = "0.4", default-features = false }
 primitive-types = { version = "0.12", default-features = false, features = ["rlp"] }
 rlp = { version = "0.5", default-features = false }
@@ -22,18 +22,12 @@ scale-codec = { package = "parity-scale-codec", version = "3.2", default-feature
 scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
 
-evm-core = { version = "0.41", path = "core", default-features = false }
-evm-gasometer = { version = "0.41", path = "gasometer", default-features = false }
-evm-runtime = { version = "0.41", path = "runtime", default-features = false }
+evm-interpreter = { version = "0.2.0-dev", path = "interpreter", default-features = false }
 
 [dev-dependencies]
 criterion = "0.4"
 hex = "0.4"
 
-[[bench]]
-name = "loop"
-harness = false
-
 [features]
 default = ["std"]
 std = [
@@ -46,38 +40,27 @@ std = [
 	"scale-codec/std",
 	"scale-info/std",
 	"serde/std",
-	"evm-core/std",
-	"evm-gasometer/std",
-	"evm-runtime/std",
+	"evm-interpreter/std",
 ]
 with-codec = [
 	"scale-codec",
 	"scale-info",
 	"primitive-types/codec",
 	"primitive-types/scale-info",
 	"ethereum/with-codec",
-	"evm-core/with-codec",
+	"evm-interpreter/with-codec",
 ]
 with-serde = [
 	"serde",
 	"primitive-types/impl-serde",
-	"evm-core/with-serde",
+	"evm-interpreter/with-serde",
 	"ethereum/with-serde",
 ]
-tracing = [
-	"environmental",
-	"evm-gasometer/tracing",
-	"evm-runtime/tracing",
-]
-force-debug = [
-	"evm-core/force-debug",
-	"evm-gasometer/force-debug",
-]
 
 [workspace]
 members = [
-	"core",
-	"gasometer",
-	"runtime",
-	"fuzzer",
+	"interpreter",
+	"jsontests",
+	"precompiles",
+	"tracer",
 ]