From dc9b67b2a5c69a58270497a64a852661df3737c8 Mon Sep 17 00:00:00 2001 From: rakita Date: Thu, 16 May 2024 16:32:47 +0300 Subject: [PATCH] Revert "feat: implement EIP-2935 (#1354)" This reverts commit 3e089f35ed2a98278ddbae8f5dd816ccc373fa31. --- crates/interpreter/src/instructions/host.rs | 52 ++++++------------- crates/interpreter/src/instructions/macros.rs | 24 --------- crates/interpreter/src/opcode.rs | 2 +- crates/primitives/src/constants.rs | 40 +++----------- 4 files changed, 23 insertions(+), 95 deletions(-) diff --git a/crates/interpreter/src/instructions/host.rs b/crates/interpreter/src/instructions/host.rs index 43cba873b0..bad571de35 100644 --- a/crates/interpreter/src/instructions/host.rs +++ b/crates/interpreter/src/instructions/host.rs @@ -5,7 +5,7 @@ use crate::{ Host, InstructionResult, SStoreResult, }; use core::cmp::min; -use revm_primitives::{BLOCKHASH_SERVE_WINDOW, BLOCKHASH_STORAGE_ADDRESS, BLOCK_HASH_HISTORY}; +use revm_primitives::BLOCK_HASH_HISTORY; use std::vec::Vec; pub fn balance(interpreter: &mut Interpreter, host: &mut H) { @@ -103,52 +103,32 @@ pub fn extcodecopy(interpreter: &mut Interpreter, .set_data(memory_offset, code_offset, len, &code.original_bytes()); } -pub fn blockhash(interpreter: &mut Interpreter, host: &mut H) { +pub fn blockhash(interpreter: &mut Interpreter, host: &mut H) { gas!(interpreter, gas::BLOCKHASH); pop_top!(interpreter, number); - let block_number = host.env().block.number; - - match block_number.checked_sub(*number) { - Some(diff) if !diff.is_zero() => { - let diff = as_usize_saturated!(diff); - - // blockhash should push zero if number is same as current block number. - if SPEC::enabled(PRAGUE) && diff <= BLOCKHASH_SERVE_WINDOW { - let value = sload!( - interpreter, - host, - BLOCKHASH_STORAGE_ADDRESS, - number.wrapping_rem(U256::from(BLOCKHASH_SERVE_WINDOW)) - ); - *number = value; + if let Some(diff) = host.env().block.number.checked_sub(*number) { + let diff = as_usize_saturated!(diff); + // blockhash should push zero if number is same as current block number. + if diff <= BLOCK_HASH_HISTORY && diff != 0 { + let Some(hash) = host.block_hash(*number) else { + interpreter.instruction_result = InstructionResult::FatalExternalError; return; - } else if diff <= BLOCK_HASH_HISTORY { - let Some(hash) = host.block_hash(*number) else { - interpreter.instruction_result = InstructionResult::FatalExternalError; - return; - }; - *number = U256::from_be_bytes(hash.0); - return; - } - } - _ => { - // If blockhash is requested for the current block, the hash should be 0, so we fall - // through. + }; + *number = U256::from_be_bytes(hash.0); + return; } } - *number = U256::ZERO; } pub fn sload(interpreter: &mut Interpreter, host: &mut H) { pop_top!(interpreter, index); - let value = sload!( - interpreter, - host, - interpreter.contract.target_address, - *index - ); + let Some((value, is_cold)) = host.sload(interpreter.contract.target_address, *index) else { + interpreter.instruction_result = InstructionResult::FatalExternalError; + return; + }; + gas!(interpreter, gas::sload_cost(SPEC::SPEC_ID, is_cold)); *index = value; } diff --git a/crates/interpreter/src/instructions/macros.rs b/crates/interpreter/src/instructions/macros.rs index a4ee4f4b3e..2592956ec7 100644 --- a/crates/interpreter/src/instructions/macros.rs +++ b/crates/interpreter/src/instructions/macros.rs @@ -45,30 +45,6 @@ macro_rules! check { }; } -/// Performs an `SLOAD` on the target account and storage index. -/// -/// If the slot could not be loaded, or if the gas cost could not be charged, the expanded code -/// sets the instruction result and returns accordingly. -/// -/// # Note -/// -/// This macro charges gas. -/// -/// # Returns -/// -/// Expands to the value of the storage slot. -#[macro_export] -macro_rules! sload { - ($interp:expr, $host:expr, $address:expr, $index:expr) => {{ - let Some((value, is_cold)) = $host.sload($address, $index) else { - $interp.instruction_result = $crate::InstructionResult::FatalExternalError; - return; - }; - $crate::gas!($interp, $crate::gas::sload_cost(SPEC::SPEC_ID, is_cold)); - value - }}; -} - /// Records a `gas` cost and fails the instruction if it would exceed the available gas. #[macro_export] macro_rules! gas { diff --git a/crates/interpreter/src/opcode.rs b/crates/interpreter/src/opcode.rs index b5b6ffd17c..672d1ecd92 100644 --- a/crates/interpreter/src/opcode.rs +++ b/crates/interpreter/src/opcode.rs @@ -604,7 +604,7 @@ opcodes! { 0x3D => RETURNDATASIZE => system::returndatasize:: => stack_io(0, 1); 0x3E => RETURNDATACOPY => system::returndatacopy:: => stack_io(3, 0); 0x3F => EXTCODEHASH => host::extcodehash:: => stack_io(1, 1), not_eof; - 0x40 => BLOCKHASH => host::blockhash:: => stack_io(1, 1); + 0x40 => BLOCKHASH => host::blockhash => stack_io(1, 1); 0x41 => COINBASE => host_env::coinbase => stack_io(0, 1); 0x42 => TIMESTAMP => host_env::timestamp => stack_io(0, 1); 0x43 => NUMBER => host_env::block_number => stack_io(0, 1); diff --git a/crates/primitives/src/constants.rs b/crates/primitives/src/constants.rs index c8223300bf..07745dd3cc 100644 --- a/crates/primitives/src/constants.rs +++ b/crates/primitives/src/constants.rs @@ -1,62 +1,34 @@ -use alloy_primitives::{address, Address}; +use crate::Address; /// EIP-170: Contract code size limit -/// -/// By default the limit is `0x6000` (~25kb) +/// By default limit is 0x6000 (~25kb) pub const MAX_CODE_SIZE: usize = 0x6000; -/// Number of block hashes that EVM can access in the past (pre-Prague). +/// Number of block hashes that EVM can access in the past pub const BLOCK_HASH_HISTORY: usize = 256; -/// EIP-2935: Serve historical block hashes from state -/// -/// Number of block hashes the EVM can access in the past (Prague). -/// -/// # Note -/// -/// This is named `HISTORY_SERVE_WINDOW` in the EIP. -pub const BLOCKHASH_SERVE_WINDOW: usize = 8192; - -/// EIP-2935: Serve historical block hashes from state -/// -/// The address where historical blockhashes are available. -/// -/// # Note -/// -/// This is named `HISTORY_STORAGE_ADDRESS` in the EIP. -pub const BLOCKHASH_STORAGE_ADDRESS: Address = address!("25a219378dad9b3503c8268c9ca836a52427a4fb"); - /// EIP-3860: Limit and meter initcode /// -/// Limit of maximum initcode size is `2 * MAX_CODE_SIZE`. +/// Limit of maximum initcode size is 2 * MAX_CODE_SIZE pub const MAX_INITCODE_SIZE: usize = 2 * MAX_CODE_SIZE; -/// The address of precompile 3, which is handled specially in a few places. +/// Precompile 3 is special in few places pub const PRECOMPILE3: Address = Address::new([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3]); - -// === EIP-4844 constants === - +// EIP-4844 constants /// Gas consumption of a single data blob (== blob byte size). pub const GAS_PER_BLOB: u64 = 1 << 17; - /// Target number of the blob per block. pub const TARGET_BLOB_NUMBER_PER_BLOCK: u64 = 3; - /// Max number of blobs per block pub const MAX_BLOB_NUMBER_PER_BLOCK: u64 = 2 * TARGET_BLOB_NUMBER_PER_BLOCK; - /// Maximum consumable blob gas for data blobs per block. pub const MAX_BLOB_GAS_PER_BLOCK: u64 = MAX_BLOB_NUMBER_PER_BLOCK * GAS_PER_BLOB; - /// Target consumable blob gas for data blobs per block (for 1559-like pricing). pub const TARGET_BLOB_GAS_PER_BLOCK: u64 = TARGET_BLOB_NUMBER_PER_BLOCK * GAS_PER_BLOB; - /// Minimum gas price for data blobs. pub const MIN_BLOB_GASPRICE: u64 = 1; - /// Controls the maximum rate of change for blob gas price. pub const BLOB_GASPRICE_UPDATE_FRACTION: u64 = 3338477; - /// First version of the blob. pub const VERSIONED_HASH_VERSION_KZG: u8 = 0x01;