jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: use BLOCKHASH_SERVE_WINDOW from revm (#8924)

Browse Source
This commit is contained in:
Oliver
2024-06-18 15:29:07 +02:00
committed by GitHub
parent d786b459d9
commit 636e856380
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/ethereum/evm/src/execute.rs
View File

@ -467,11 +467,10 @@ mod tests {
keccak256, public_key_to_address, Account, Block, Transaction, TxKind, TxLegacy, B256, keccak256, public_key_to_address, Account, Block, Transaction, TxKind, TxLegacy, B256,
}; };
use reth_revm::{ use reth_revm::{
database::StateProviderDatabase, state_change::HISTORY_SERVE_WINDOW, database::StateProviderDatabase, test_utils::StateProviderTest, TransitionState,
test_utils::StateProviderTest, TransitionState,
}; };
use reth_testing_utils::generators::{self, sign_tx_with_key_pair}; use reth_testing_utils::generators::{self, sign_tx_with_key_pair};
use revm_primitives::{b256, fixed_bytes, Bytes}; use revm_primitives::{b256, fixed_bytes, Bytes, BLOCKHASH_SERVE_WINDOW};
use secp256k1::{Keypair, Secp256k1}; use secp256k1::{Keypair, Secp256k1};
use std::collections::HashMap; use std::collections::HashMap;
@ -976,7 +975,7 @@ mod tests {
#[test] #[test]
fn eip_2935_fork_activation_within_window_bounds() { fn eip_2935_fork_activation_within_window_bounds() {
let fork_activation_block = HISTORY_SERVE_WINDOW - 10; let fork_activation_block = (BLOCKHASH_SERVE_WINDOW - 10) as u64;
let db = create_state_provider_with_block_hashes(fork_activation_block); let db = create_state_provider_with_block_hashes(fork_activation_block);
let chain_spec = Arc::new( let chain_spec = Arc::new(
@ -1039,7 +1038,7 @@ mod tests {
#[test] #[test]
fn eip_2935_fork_activation_outside_window_bounds() { fn eip_2935_fork_activation_outside_window_bounds() {
let fork_activation_block = HISTORY_SERVE_WINDOW + 256; let fork_activation_block = (BLOCKHASH_SERVE_WINDOW + 256) as u64;
let db = create_state_provider_with_block_hashes(fork_activation_block); let db = create_state_provider_with_block_hashes(fork_activation_block);
let chain_spec = Arc::new( let chain_spec = Arc::new(
@ -1090,7 +1089,7 @@ mod tests {
.state_mut() .state_mut()
.storage( .storage(
HISTORY_STORAGE_ADDRESS, HISTORY_STORAGE_ADDRESS,
U256::from(fork_activation_block % HISTORY_SERVE_WINDOW - 1) U256::from(fork_activation_block % BLOCKHASH_SERVE_WINDOW as u64 - 1)
) )
.unwrap(), .unwrap(),
U256::ZERO U256::ZERO

8
crates/revm/src/state_change.rs
View File

@ -17,7 +17,8 @@ use reth_storage_errors::provider::ProviderError;
use revm::{ use revm::{
interpreter::Host, interpreter::Host,
primitives::{ primitives::{
Account, AccountInfo, Bytecode, EvmStorageSlot, ExecutionResult, FixedBytes, ResultAndState, Account, AccountInfo, Bytecode, EvmStorageSlot, ExecutionResult, FixedBytes,
ResultAndState, BLOCKHASH_SERVE_WINDOW,
}, },
Database, DatabaseCommit, Evm, Database, DatabaseCommit, Evm,
}; };
@ -67,9 +68,6 @@ pub fn post_block_balance_increments(
balance_increments balance_increments
} }
/// todo: temporary move over of constants from revm until we've migrated to the latest version
pub const HISTORY_SERVE_WINDOW: u64 = 8192;
/// Applies the pre-block state change outlined in [EIP-2935] to store historical blockhashes in a /// Applies the pre-block state change outlined in [EIP-2935] to store historical blockhashes in a
/// system contract. /// system contract.
/// ///
@ -131,7 +129,7 @@ fn eip2935_block_hash_slot<DB: Database<Error = ProviderError>>(
block_number: u64, block_number: u64,
block_hash: B256, block_hash: B256,
) -> Result<(U256, EvmStorageSlot), BlockValidationError> { ) -> Result<(U256, EvmStorageSlot), BlockValidationError> {
let slot = U256::from(block_number % HISTORY_SERVE_WINDOW); let slot = U256::from(block_number % BLOCKHASH_SERVE_WINDOW as u64);
let current_hash = db let current_hash = db
.storage(HISTORY_STORAGE_ADDRESS, slot) .storage(HISTORY_STORAGE_ADDRESS, slot)
.map_err(BlockValidationError::BlockHashAccountLoadingFailed)?; .map_err(BlockValidationError::BlockHashAccountLoadingFailed)?;