feat: implement EIP-2935

crates/interpreter/src/instructions/host.rs

@@ -5,7 +5,7 @@ use crate::{
     Host, InstructionResult, SStoreResult,
 };
 use core::cmp::min;
-use revm_primitives::BLOCK_HASH_HISTORY;
+use revm_primitives::{BLOCK_HASH_HISTORY, HISTORY_SERVE_WINDOW, HISTORY_STORAGE_ADDRESS};
 use std::vec::Vec;
 
 pub fn balance<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut H) {
@@ -103,14 +103,28 @@ pub fn extcodecopy<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter,
         .set_data(memory_offset, code_offset, len, &code.original_bytes());
 }
 
-pub fn blockhash<H: Host + ?Sized>(interpreter: &mut Interpreter, host: &mut H) {
+pub fn blockhash<H: Host + ?Sized, SPEC: Spec>(interpreter: &mut Interpreter, host: &mut H) {
     gas!(interpreter, gas::BLOCKHASH);
     pop_top!(interpreter, number);
 
-    if let Some(diff) = host.env().block.number.checked_sub(*number) {
+    let block_number = host.env().block.number;
+
+    if let Some(diff) = 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 {
+        if SPEC::enabled(PRAGUE) && diff <= HISTORY_SERVE_WINDOW && diff != 0 {
+            let Some((value, is_cold)) = host.sload(
+                HISTORY_STORAGE_ADDRESS,
+                number.wrapping_rem(U256::from(HISTORY_SERVE_WINDOW)),
+            ) else {
+                interpreter.instruction_result = InstructionResult::FatalExternalError;
+                return;
+            };
+            gas!(interpreter, gas::sload_cost(SPEC::SPEC_ID, is_cold));
+            *number = value;
+            return;
+        } else if diff <= BLOCK_HASH_HISTORY && diff != 0 {
             let Some(hash) = host.block_hash(*number) else {
                 interpreter.instruction_result = InstructionResult::FatalExternalError;
                 return;
@@ -119,6 +133,7 @@ pub fn blockhash<H: Host + ?Sized>(interpreter: &mut Interpreter, host: &mut H)
             return;
         }
     }
+
     *number = U256::ZERO;
 }
 

crates/interpreter/src/opcode.rs

@@ -443,7 +443,7 @@ opcodes! {
     0x3D => RETURNDATASIZE => system::returndatasize::<H, SPEC> => stack_io<0, 1>;
     0x3E => RETURNDATACOPY => system::returndatacopy::<H, SPEC> => stack_io<3, 0>;
     0x3F => EXTCODEHASH    => host::extcodehash::<H, SPEC>      => stack_io<1, 1>, not_eof;
-    0x40 => BLOCKHASH      => host::blockhash                   => stack_io<1, 1>;
+    0x40 => BLOCKHASH      => host::blockhash::<H, SPEC>        => 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>;

crates/primitives/src/constants.rs

@@ -1,12 +1,24 @@
+use alloy_primitives::address;
+
 use crate::Address;
 
 /// EIP-170: Contract code size limit
 /// By default limit is 0x6000 (~25kb)
 pub const MAX_CODE_SIZE: usize = 0x6000;
 
-/// Number of block hashes that EVM can access in the past
+/// Number of block hashes that EVM can access in the past (pre-Prague).
 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).
+pub const HISTORY_SERVE_WINDOW: usize = 8192;
+
+/// EIP-2935: Serve historical block hashes from state
+///
+/// The address where historical blockhashes are available.
+pub const HISTORY_STORAGE_ADDRESS: Address = address!("25a219378dad9b3503c8268c9ca836a52427a4fb");
+
 /// EIP-3860: Limit and meter initcode
 ///
 /// Limit of maximum initcode size is 2 * MAX_CODE_SIZE