Merge pull request #567 from ethereum/statetests-branch

Support Cancun and Prague revisions in state tests
ethereum · Feb 20, 2023 · 09851dd · 09851dd
2 parents 937d79d + 25a72fe
commit 09851dd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/evmc b/evmc
diff --git a/lib/evmone/instructions_traits.hpp b/lib/evmone/instructions_traits.hpp
@@ -167,6 +167,8 @@ constexpr inline GasCostTable gas_costs = []() noexcept {
     table[EVMC_CANCUN][OP_DUPN] = 3;
     table[EVMC_CANCUN][OP_SWAPN] = 3;
 
+    table[EVMC_PRAGUE] = table[EVMC_CANCUN];
+
     return table;
 }();
 

diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
@@ -22,7 +22,7 @@ DUP1,4
     add_test(NAME ${PREFIX}/trace COMMAND $<TARGET_FILE:evmc::tool> --vm $<TARGET_FILE:evmone>,trace run 60006002800103)
     set_tests_properties(
         ${PREFIX}/trace PROPERTIES PASS_REGULAR_EXPRESSION
-        "{\"depth\":0,\"rev\":\"London\",\"static\":false}
+        "{\"depth\":0,\"rev\":\"Paris\",\"static\":false}
 {\"pc\":0,\"op\":96,\"opName\":\"PUSH1\",\"gas\":1000000,\"stack\":\\[\\],\"memorySize\":0}
 {\"pc\":2,\"op\":96,\"opName\":\"PUSH1\",\"gas\":999997,\"stack\":\\[\"0x0\"\\],\"memorySize\":0}
 {\"pc\":4,\"op\":128,\"opName\":\"DUP1\",\"gas\":999994,\"stack\":\\[\"0x0\",\"0x2\"\\],\"memorySize\":0}

diff --git a/test/statetest/statetest_loader.cpp b/test/statetest/statetest_loader.cpp
@@ -179,6 +179,10 @@ evmc_revision to_rev(std::string_view s)
         return EVMC_SHANGHAI;
     if (s == "Shanghai")
         return EVMC_SHANGHAI;
+    if (s == "Cancun")
+        return EVMC_CANCUN;
+    if (s == "Prague")
+        return EVMC_PRAGUE;
     throw std::invalid_argument{"unknown revision: " + std::string{s}};
 }
 

diff --git a/test/unittests/instructions_test.cpp b/test/unittests/instructions_test.cpp
@@ -105,7 +105,7 @@ TEST(instructions, compare_with_evmc_instruction_tables)
         {
             // Skip DUPN and SWAPN for Cancun. They are not defined in evmc
             // TODO: Define DUPN and SWAPN in evmc
-            if (r == EVMC_CANCUN && (Opcode(i) == OP_DUPN || Opcode(i) == OP_SWAPN))
+            if (r >= EVMC_CANCUN && (Opcode(i) == OP_DUPN || Opcode(i) == OP_SWAPN))
                 continue;
             const auto gas_cost = (instr_tbl[i] != instr::undefined) ? instr_tbl[i] : 0;
             const auto& metrics = evmone_tbl[i];
+8 −0		CHANGELOG.md
+75 −82		Doxyfile
+1 −0		bindings/go/evmc/evmc.go
+2 −2		bindings/go/evmc/evmc_test.go
+2 −2		bindings/rust/evmc-declare/src/lib.rs
+76 −3		circle.yml
+23 −14		include/evmc/evmc.h
+2 −0		include/evmc/helpers.h
+260 −0		lib/instructions/instruction_metrics.c
+261 −0		lib/instructions/instruction_names.c
+1 −1		test/tools/CMakeLists.txt
+1 −0		test/unittests/cpp_test.cpp