Merge pull request #309 from ethereum/evmc_upgrade

Upgrade EVMC to 8.0.0
ethereum · Apr 27, 2021 · 0c7f606 · 0c7f606
2 parents 3361221 + 3c9ea6d
commit 0c7f606
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/evmc b/evmc
diff --git a/lib/evmone/baseline.cpp b/lib/evmone/baseline.cpp
@@ -214,9 +214,9 @@ evmc_result baseline_execute(ExecutionState& state, const JumpdestMap& jumpdest_
             sar(state.stack);
             break;
 
-        case OP_SHA3:
+        case OP_KECCAK256:
         {
-            const auto status_code = sha3(state);
+            const auto status_code = keccak256(state);
             if (status_code != EVMC_SUCCESS)
             {
                 state.status = status_code;

diff --git a/lib/evmone/instruction_traits.hpp b/lib/evmone/instruction_traits.hpp
@@ -67,7 +67,7 @@ constexpr inline std::array<Traits, 256> traits = []() noexcept {
     table[OP_SHR] = {"SHR", 2, -1};
     table[OP_SAR] = {"SAR", 2, -1};
 
-    table[OP_SHA3] = {"SHA3", 2, -1};
+    table[OP_KECCAK256] = {"KECCAK256", 2, -1};
 
     table[OP_ADDRESS] = {"ADDRESS", 0, 1};
     table[OP_BALANCE] = {"BALANCE", 1, 0};
@@ -233,7 +233,7 @@ constexpr inline std::array<int16_t, 256> gas_costs<EVMC_FRONTIER> = []() noexce
     table[OP_XOR] = 3;
     table[OP_NOT] = 3;
     table[OP_BYTE] = 3;
-    table[OP_SHA3] = 30;
+    table[OP_KECCAK256] = 30;
     table[OP_ADDRESS] = 2;
     table[OP_BALANCE] = 20;
     table[OP_ORIGIN] = 2;

diff --git a/lib/evmone/instructions.cpp b/lib/evmone/instructions.cpp
@@ -227,7 +227,7 @@ constexpr std::array<instruction_exec_fn, 256> instruction_implementations = [](
     table[OP_SHR] = op<shr>;
     table[OP_SAR] = op<sar>;
 
-    table[OP_SHA3] = op<sha3>;
+    table[OP_KECCAK256] = op<keccak256>;
 
     table[OP_ADDRESS] = op<address>;
     table[OP_BALANCE] = op<balance>;

diff --git a/lib/evmone/instructions.hpp b/lib/evmone/instructions.hpp
@@ -253,7 +253,7 @@ inline void sar(evm_stack& stack) noexcept
 }
 
 
-inline evmc_status_code sha3(ExecutionState& state) noexcept
+inline evmc_status_code keccak256(ExecutionState& state) noexcept
 {
     const auto index = state.stack.pop();
     auto& size = state.stack.top();

diff --git a/test/unittests/evm_test.cpp b/test/unittests/evm_test.cpp
@@ -598,7 +598,7 @@ TEST_P(evm, invalid)
     EXPECT_EQ(result.gas_left, 0);
 }
 
-TEST_P(evm, sha3)
+TEST_P(evm, keccak256)
 {
     execute("6108006103ff2060005260206000f3");
     EXPECT_EQ(result.status_code, EVMC_SUCCESS);
@@ -608,9 +608,9 @@ TEST_P(evm, sha3)
     EXPECT_EQ(bytes(&result.output_data[0], 32), hash);
 }
 
-TEST_P(evm, sha3_empty)
+TEST_P(evm, keccak256_empty)
 {
-    auto code = push(0) + OP_DUP1 + OP_SHA3 + ret_top();
+    auto code = push(0) + OP_DUP1 + OP_KECCAK256 + ret_top();
     execute(code);
     ASSERT_EQ(result.output_size, 32);
     auto keccak256_empty = "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470";
@@ -820,11 +820,11 @@ TEST_P(evm, mstore8_memory_cost)
     EXPECT_EQ(result.status_code, EVMC_OUT_OF_GAS);
 }
 
-TEST_P(evm, sha3_memory_cost)
+TEST_P(evm, keccak256_memory_cost)
 {
-    execute(45, sha3(0, 1));
+    execute(45, keccak256(0, 1));
     EXPECT_EQ(result.status_code, EVMC_SUCCESS);
-    execute(44, sha3(0, 1));
+    execute(44, keccak256(0, 1));
     EXPECT_EQ(result.status_code, EVMC_OUT_OF_GAS);
 }
 
@@ -894,7 +894,7 @@ struct memory_access_params
 };
 
 memory_access_opcode memory_access_opcodes[] = {
-    {OP_SHA3, 0, 1},
+    {OP_KECCAK256, 0, 1},
     {OP_CALLDATACOPY, 0, 2},
     {OP_CODECOPY, 0, 2},
     {OP_MLOAD, 0, -1},

diff --git a/test/utils/bytecode.hpp b/test/utils/bytecode.hpp
@@ -188,9 +188,9 @@ inline bytecode ret(bytecode c)
     return c + ret_top();
 }
 
-inline bytecode sha3(bytecode index, bytecode size)
+inline bytecode keccak256(bytecode index, bytecode size)
 {
-    return size + index + OP_SHA3;
+    return size + index + OP_KECCAK256;
 }
 
 inline bytecode calldataload(bytecode index)
+1 −1		.bumpversion.cfg
+13 −3		CHANGELOG.md
+1 −1		CMakeLists.txt
+24 −15		bindings/java/c/evmc-vm.c
+3 −14		bindings/java/java/src/main/java/org/ethereum/evmc/EvmcVm.java
+1 −1		bindings/rust/evmc-declare-tests/Cargo.toml
+2 −2		bindings/rust/evmc-declare/Cargo.toml
+1 −1		bindings/rust/evmc-sys/Cargo.toml
+2 −2		bindings/rust/evmc-vm/Cargo.toml
+4 −5		circle.yml
+1 −1		examples/example-rust-vm/Cargo.toml
+1 −1		examples/example-rust-vm/src/lib.rs
+1 −1		include/evmc/instructions.h
+29 −3		include/evmc/mocked_host.hpp
+7 −7		lib/instructions/instruction_metrics.c
+5 −5		lib/instructions/instruction_names.c