Merge pull request #451 from ethereum/eip-4399

Rename DIFFICULTY -> PREVRANDAO
ethereum · Mar 29, 2022 · b9e5c4a · b9e5c4a
2 parents 0e11c21 + 9da9dd3
commit b9e5c4a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/evmc b/evmc
diff --git a/lib/evmone/instructions.hpp b/lib/evmone/instructions.hpp
@@ -614,9 +614,9 @@ inline void number(StackTop stack, ExecutionState& state) noexcept
     stack.push(static_cast<uint64_t>(state.get_tx_context().block_number));
 }
 
-inline void difficulty(StackTop stack, ExecutionState& state) noexcept
+inline void prevrandao(StackTop stack, ExecutionState& state) noexcept
 {
-    stack.push(intx::be::load<uint256>(state.get_tx_context().block_difficulty));
+    stack.push(intx::be::load<uint256>(state.get_tx_context().block_prev_randao));
 }
 
 inline void gaslimit(StackTop stack, ExecutionState& state) noexcept

diff --git a/lib/evmone/instructions_traits.hpp b/lib/evmone/instructions_traits.hpp
@@ -78,7 +78,7 @@ constexpr inline GasCostTable gas_costs = []() noexcept {
     table[EVMC_FRONTIER][OP_COINBASE] = 2;
     table[EVMC_FRONTIER][OP_TIMESTAMP] = 2;
     table[EVMC_FRONTIER][OP_NUMBER] = 2;
-    table[EVMC_FRONTIER][OP_DIFFICULTY] = 2;
+    table[EVMC_FRONTIER][OP_PREVRANDAO] = 2;
     table[EVMC_FRONTIER][OP_GASLIMIT] = 2;
     table[EVMC_FRONTIER][OP_POP] = 2;
     table[EVMC_FRONTIER][OP_MLOAD] = 3;
@@ -265,7 +265,7 @@ constexpr inline std::array<Traits, 256> traits = []() noexcept {
     table[OP_COINBASE] = {"COINBASE", 0, 1, EVMC_FRONTIER};
     table[OP_TIMESTAMP] = {"TIMESTAMP", 0, 1, EVMC_FRONTIER};
     table[OP_NUMBER] = {"NUMBER", 0, 1, EVMC_FRONTIER};
-    table[OP_DIFFICULTY] = {"DIFFICULTY", 0, 1, EVMC_FRONTIER};
+    table[OP_PREVRANDAO] = {"PREVRANDAO", 0, 1, EVMC_FRONTIER};
     table[OP_GASLIMIT] = {"GASLIMIT", 0, 1, EVMC_FRONTIER};
     table[OP_CHAINID] = {"CHAINID", 0, 1, EVMC_ISTANBUL};
     table[OP_SELFBALANCE] = {"SELFBALANCE", 0, 1, EVMC_ISTANBUL};

diff --git a/lib/evmone/instructions_xmacro.hpp b/lib/evmone/instructions_xmacro.hpp
@@ -51,7 +51,7 @@
     X(OP_COINBASE, coinbase)             \
     X(OP_TIMESTAMP, timestamp)           \
     X(OP_NUMBER, number)                 \
-    X(OP_DIFFICULTY, difficulty)         \
+    X(OP_PREVRANDAO, prevrandao)         \
     X(OP_GASLIMIT, gaslimit)             \
     X(OP_CHAINID, chainid)               \
     X(OP_SELFBALANCE, selfbalance)       \

diff --git a/test/unittests/evm_state_test.cpp b/test/unittests/evm_state_test.cpp
@@ -251,11 +251,11 @@ TEST_P(evm, tx_context)
     host.tx_context.chain_id.bytes[28] = 0xaa;
     host.tx_context.block_coinbase.bytes[1] = 0xcc;
     host.tx_context.tx_origin.bytes[2] = 0x55;
-    host.tx_context.block_difficulty.bytes[1] = 0xdd;
+    host.tx_context.block_prev_randao.bytes[1] = 0xdd;
     host.tx_context.tx_gas_price.bytes[2] = 0x66;
 
     auto const code = bytecode{} + OP_TIMESTAMP + OP_COINBASE + OP_OR + OP_GASPRICE + OP_OR +
-                      OP_NUMBER + OP_OR + OP_DIFFICULTY + OP_OR + OP_GASLIMIT + OP_OR + OP_ORIGIN +
+                      OP_NUMBER + OP_OR + OP_PREVRANDAO + OP_OR + OP_GASLIMIT + OP_OR + OP_ORIGIN +
                       OP_OR + OP_CHAINID + OP_OR + ret_top();
     execute(52, code);
     EXPECT_EQ(result.status_code, EVMC_SUCCESS);

diff --git a/test/unittests/evm_test.cpp b/test/unittests/evm_test.cpp
@@ -717,13 +717,13 @@ TEST_P(evm, return_empty_buffer_at_offset_0)
 
 TEST_P(evm, return_empty_buffer_at_high_offset)
 {
-    host.tx_context.block_difficulty =
+    host.tx_context.block_prev_randao =
         0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1_bytes32;
 
-    execute(push(0) + OP_DIFFICULTY + OP_RETURN);
+    execute(push(0) + OP_PREVRANDAO + OP_RETURN);
     EXPECT_STATUS(EVMC_SUCCESS);
 
-    execute(push(0) + OP_DIFFICULTY + OP_REVERT);
+    execute(push(0) + OP_PREVRANDAO + OP_REVERT);
     EXPECT_STATUS(EVMC_REVERT);
 }
+1 −1		.bumpversion.cfg
+3 −0		CHANGELOG.md
+1 −1		CMakeLists.txt
+2 −2		bindings/go/evmc/host.go
+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
+1 −1		bindings/rust/evmc-vm/src/container.rs
+1 −1		bindings/rust/evmc-vm/src/lib.rs
+1 −1		examples/example-rust-vm/Cargo.toml
+1 −1		examples/example-rust-vm/src/lib.rs
+9 −9		include/evmc/evmc.h
+1 −1		include/evmc/instructions.h
+2 −2		lib/instructions/instruction_metrics.c
+262 −2		lib/instructions/instruction_names.c
+6 −1		test/unittests/instructions_test.cpp