Merge pull request #348 from ethereum/upgrade_evmc

Upgrade EVMC to 9.0.0
ethereum · Jun 30, 2021 · 26f7bba · 26f7bba
2 parents c153234 + c934462
commit 26f7bba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/evmc b/evmc
diff --git a/lib/evmone/instruction_traits.hpp b/lib/evmone/instruction_traits.hpp
@@ -157,6 +157,8 @@ constexpr inline GasCostTable gas_costs = []() noexcept {
     table[EVMC_LONDON] = table[EVMC_BERLIN];
     table[EVMC_LONDON][OP_BASEFEE] = 2;
 
+    table[EVMC_SHANGHAI] = table[EVMC_LONDON];
+
     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>,O=0,trace run 60006002800103)
     set_tests_properties(
         ${PREFIX}/trace PROPERTIES PASS_REGULAR_EXPRESSION
-        "{\"depth\":0,\"rev\":\"Berlin\",\"static\":false}
+        "{\"depth\":0,\"rev\":\"London\",\"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}