Merge pull request #541 from ethereum/state-tests

Upgrade state tests

Author: chfast

circle.yml

@@ -138,16 +138,23 @@ commands:
           paths:
             - ~/silkworm/consensus
 
-  download_consensus_tests:
+  download_execution_tests:
     parameters:
       rev:
         type: string
+        default: develop
+      commit:
+        type: string
+        default: ""
     steps:
       - run:
-          name: "Download consensus tests: <<parameters.rev>>"
+          name: "Download execution tests: <<parameters.rev>> <<parameters.commit>>"
           working_directory: ~/tests
           command: |
-            git clone --depth=1 --recurse-submodules --shallow-submodules --single-branch https://github.com/ethereum/tests . --branch <<parameters.rev>>
+            git clone --no-checkout --depth=250 --single-branch https://github.com/ethereum/tests . --branch <<parameters.rev>>
+            <<#parameters.rev>>git checkout <<parameters.rev>><</parameters.rev>>
+            <<#parameters.commit>>git checkout <<parameters.commit>><</parameters.commit>>
+            git submodule update --init --recursive --depth=1 --progress
 
   build:
     description: "Build"
@@ -366,7 +373,7 @@ jobs:
       - build
       - build_silkworm:
           commit: 98e4908f57643def0069ac9ae85a26eba715d8a7
-      - download_consensus_tests:
+      - download_execution_tests:
           rev: v11.1
       - run:
           name: "Silkworm-driven blockchain tests (Advanced)"
@@ -389,12 +396,11 @@ jobs:
       CMAKE_OPTIONS: -DCMAKE_CXX_FLAGS=-Og
     steps:
       - build
-      - download_consensus_tests:
-          rev: v11.1
+      - download_execution_tests:
+          commit: e279c3d0a53e2f3055c7d7f72f993b62dde18e36
       - run:
           name: "State tests"
           working_directory: ~/build
-          # TODO: Some state tests are expected to fail because precompiles are not implemented.
           command: EVMONE_PRECOMPILES_STUB=~/project/test/state/precompiles_stub.json bin/evmone-statetest ~/tests/GeneralStateTests ~/tests/LegacyTests/Constantinople/GeneralStateTests
       - collect_coverage_gcc
       - upload_coverage:

test/state/state.cpp

@@ -116,7 +116,12 @@ std::optional<std::vector<Log>> transition(
     auto& sender_acc = state.get(tx.sender);
     const auto execution_gas_limit = validate_transaction(sender_acc, block, tx, rev);
     if (execution_gas_limit < 0)
+    {
+        // Pre EIP-158 coinbase has to be touched also for invalid tx.
+        if (rev <= EVMC_TANGERINE_WHISTLE)
+            state.touch(block.coinbase);
         return {};
+    }
 
     const auto base_fee = (rev >= EVMC_LONDON) ? block.base_fee : 0;
     assert(tx.max_gas_price >= base_fee);                   // Checked at the front.

test/statetest/statetest.cpp

@@ -61,6 +61,8 @@ int main(int argc, char* argv[])
     // The default test filter. To enable all tests use `--gtest_filter=*`.
     testing::FLAGS_gtest_filter =
         "-"
+        // Unsupported or broken EIP implementations:
+        "EIPTests/stEOF/*.*:"  // EOF implementation is broken
         // Slow tests:
         "stCreateTest.CreateOOGafterMaxCodesize:"      // pass
         "stQuadraticComplexityTest.Call50000_sha256:"  // pass

test/statetest/statetest_loader.cpp

@@ -108,6 +108,10 @@ evmc_revision to_rev(std::string_view s)
         return EVMC_LONDON;
     if (s == "Merge")
         return EVMC_PARIS;
+    if (s == "Merge+3855")  // PUSH0
+        return EVMC_SHANGHAI;
+    if (s == "Shanghai")
+        return EVMC_SHANGHAI;
     throw std::invalid_argument{"unknown revision: " + std::string{s}};
 }
 }  // namespace