chore: bump alloy-evm (paradigmxyz#14917)

Author: klkvr

Cargo.lock

@@ -448,13 +448,13 @@ revm-inspectors = "0.16"
 alloy-chains = { version = "0.1.32", default-features = false }
 alloy-dyn-abi = "0.8.20"
 alloy-eip2124 = { version = "0.1.0", default-features = false }
-alloy-evm = { git = "https://github.com/alloy-rs/evm", rev = "69c77cf", default-features = false }
+alloy-evm = { git = "https://github.com/alloy-rs/evm", rev = "f9ed4d3", default-features = false }
 alloy-primitives = { version = "0.8.20", default-features = false, features = ["map-foldhash"] }
 alloy-rlp = { version = "0.3.10", default-features = false, features = ["core-net"] }
 alloy-sol-types = { version = "0.8.20", default-features = false }
 alloy-trie = { version = "0.7", default-features = false }
 
-alloy-hardforks = { git = "https://github.com/alloy-rs/hardforks", rev = "42a3427" }
+alloy-hardforks = { git = "https://github.com/alloy-rs/hardforks", rev = "ae4176c" }
 
 alloy-consensus = { version = "0.12.2", default-features = false }
 alloy-contract = { version = "0.12.2", default-features = false }
@@ -486,8 +486,8 @@ alloy-transport-ipc = { version = "0.12.2", default-features = false }
 alloy-transport-ws = { version = "0.12.2", default-features = false }
 
 # op
-alloy-op-evm = { git = "https://github.com/alloy-rs/evm", rev = "69c77cf", default-features = false }
-alloy-op-hardforks = { git = "https://github.com/alloy-rs/hardforks", rev = "42a3427" }
+alloy-op-evm = { git = "https://github.com/alloy-rs/evm", rev = "f9ed4d3", default-features = false }
+alloy-op-hardforks = { git = "https://github.com/alloy-rs/hardforks", rev = "ae4176c" }
 op-alloy-rpc-types = { version = "0.11.0", default-features = false }
 op-alloy-rpc-types-engine = { version = "0.11.0", default-features = false }
 op-alloy-network = { version = "0.11.0", default-features = false }

Cargo.toml

@@ -18,6 +18,7 @@ alloy-trie = { workspace = true, features = ["ethereum"] }
 reth-primitives-traits.workspace = true
 
 # ethereum
+alloy-evm.workspace = true
 alloy-chains = { workspace = true, features = ["serde", "rlp"] }
 alloy-eips = { workspace = true, features = ["serde"] }
 alloy-genesis.workspace = true
@@ -51,6 +52,7 @@ std = [
     "derive_more/std",
     "reth-network-peers/std",
     "serde_json/std",
+    "alloy-evm/std",
 ]
 arbitrary = [
     "alloy-chains/arbitrary",

crates/chainspec/Cargo.toml

@@ -1,4 +1,5 @@
 pub use alloy_eips::eip1559::BaseFeeParams;
+use alloy_evm::eth::spec::EthExecutorSpec;
 
 use crate::{
     constants::{MAINNET_DEPOSIT_CONTRACT, MAINNET_PRUNE_DELETE_LIMIT},
@@ -1000,6 +1001,12 @@ impl From<&Arc<ChainSpec>> for ChainSpecBuilder {
     }
 }
 
+impl EthExecutorSpec for ChainSpec {
+    fn deposit_contract_address(&self) -> Option<Address> {
+        self.deposit_contract.map(|deposit_contract| deposit_contract.address)
+    }
+}
+
 /// `PoS` deposit contract details.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct DepositContract {
@@ -1035,6 +1042,8 @@ pub fn test_fork_ids(spec: &ChainSpec, cases: &[(Head, ForkId)]) {
 mod tests {
     use super::*;
     use alloy_chains::Chain;
+    use alloy_consensus::constants::ETH_TO_WEI;
+    use alloy_evm::block::calc::{base_block_reward, block_reward};
     use alloy_genesis::{ChainConfig, GenesisAccount};
     use alloy_primitives::{b256, hex};
     use alloy_trie::{TrieAccount, EMPTY_ROOT_HASH};
@@ -2415,4 +2424,40 @@ Post-merge hard forks (timestamp based):
             .all(|(expected, actual)| &**expected == *actual));
         assert_eq!(expected_hardforks.len(), hardforks.len());
     }
+
+    #[test]
+    fn test_calc_base_block_reward() {
+        // ((block number, td), reward)
+        let cases = [
+            // Pre-byzantium
+            ((0, U256::ZERO), Some(ETH_TO_WEI * 5)),
+            // Byzantium
+            ((4370000, U256::ZERO), Some(ETH_TO_WEI * 3)),
+            // Petersburg
+            ((7280000, U256::ZERO), Some(ETH_TO_WEI * 2)),
+            // Merge
+            ((15537394, U256::from(58_750_000_000_000_000_000_000_u128)), None),
+        ];
+
+        for ((block_number, _td), expected_reward) in cases {
+            assert_eq!(base_block_reward(&*MAINNET, block_number), expected_reward);
+        }
+    }
+
+    #[test]
+    fn test_calc_full_block_reward() {
+        let base_reward = ETH_TO_WEI;
+        let one_thirty_twoth_reward = base_reward >> 5;
+
+        // (num_ommers, reward)
+        let cases = [
+            (0, base_reward),
+            (1, base_reward + one_thirty_twoth_reward),
+            (2, base_reward + one_thirty_twoth_reward * 2),
+        ];
+
+        for (num_ommers, expected_reward) in cases {
+            assert_eq!(block_reward(base_reward, num_ommers), expected_reward);
+        }
+    }
 }

crates/chainspec/src/spec.rs

@@ -16,7 +16,6 @@ reth-chainspec.workspace = true
 reth-consensus.workspace = true
 
 # ethereum
-alloy-primitives.workspace = true
 reth-primitives-traits.workspace = true
 alloy-consensus.workspace = true
 alloy-eips.workspace = true
@@ -32,9 +31,9 @@ default = ["std"]
 std = [
     "alloy-consensus/std",
     "alloy-eips/std",
-    "alloy-primitives/std",
     "reth-chainspec/std",
     "reth-consensus/std",
     "reth-primitives-traits/std",
     "reth-ethereum-primitives/std",
+    "alloy-primitives/std",
 ]

crates/consensus/common/Cargo.toml

@@ -11,6 +11,3 @@
 
 /// Collection of consensus validation methods.
 pub mod validation;
-
-/// Various calculation methods (e.g. block rewards)
-pub mod calc;

crates/consensus/common/src/calc.rs

@@ -35,6 +35,7 @@ reth-trie-sparse.workspace = true
 reth-trie.workspace = true
 
 # alloy
+alloy-evm.workspace = true
 alloy-consensus.workspace = true
 alloy-eips.workspace = true
 alloy-primitives.workspace = true

crates/consensus/common/src/lib.rs

@@ -4,6 +4,7 @@
 #![allow(missing_docs)]
 
 use alloy_consensus::constants::KECCAK_EMPTY;
+use alloy_evm::block::StateChangeSource;
 use alloy_primitives::{Address, B256};
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use proptest::test_runner::TestRunner;
@@ -14,7 +15,7 @@ use reth_db_common::init::init_genesis;
 use reth_engine_tree::tree::{
     executor::WorkloadExecutor, PayloadProcessor, StateProviderBuilder, TreeConfig,
 };
-use reth_evm::system_calls::{OnStateHook, StateChangeSource};
+use reth_evm::OnStateHook;
 use reth_evm_ethereum::EthEvmConfig;
 use reth_primitives_traits::{Account as RethAccount, StorageEntry};
 use reth_provider::{

crates/engine/tree/Cargo.toml

@@ -10,15 +10,13 @@ use crate::tree::{
     StateProviderBuilder, TreeConfig,
 };
 use alloy_consensus::{transaction::Recovered, BlockHeader};
+use alloy_evm::block::StateChangeSource;
 use alloy_primitives::B256;
 use executor::WorkloadExecutor;
 use multiproof::*;
 use parking_lot::RwLock;
 use prewarm::PrewarmMetrics;
-use reth_evm::{
-    system_calls::{OnStateHook, StateChangeSource},
-    ConfigureEvm, ConfigureEvmEnvFor,
-};
+use reth_evm::{ConfigureEvm, ConfigureEvmEnvFor, OnStateHook};
 use reth_primitives_traits::{NodePrimitives, SealedHeaderFor};
 use reth_provider::{
     providers::ConsistentDbView, BlockReader, DatabaseProviderFactory, StateCommitmentProvider,
@@ -392,10 +390,11 @@ mod tests {
         },
         StateProviderBuilder, TreeConfig,
     };
+    use alloy_evm::block::StateChangeSource;
     use reth_chainspec::ChainSpec;
     use reth_db_common::init::init_genesis;
     use reth_ethereum_primitives::EthPrimitives;
-    use reth_evm::system_calls::{OnStateHook, StateChangeSource};
+    use reth_evm::OnStateHook;
     use reth_evm_ethereum::EthEvmConfig;
     use reth_primitives_traits::{Account, StorageEntry};
     use reth_provider::{

crates/engine/tree/benches/state_root_task.rs

@@ -1,11 +1,11 @@
 //! Multiproof task related functionality.
 
 use crate::tree::payload_processor::{executor::WorkloadExecutor, sparse_trie::SparseTrieEvent};
+use alloy_evm::block::StateChangeSource;
 use alloy_primitives::{keccak256, map::HashSet, B256};
 use derive_more::derive::Deref;
 use metrics::Histogram;
 use reth_errors::ProviderError;
-use reth_evm::system_calls::StateChangeSource;
 use reth_metrics::Metrics;
 use reth_provider::{
     providers::ConsistentDbView, BlockReader, DatabaseProviderFactory, StateCommitmentProvider,

crates/engine/tree/src/tree/payload_processor/mod.rs

@@ -12,26 +12,18 @@ workspace = true
 
 [dependencies]
 # reth
-reth-ethereum-primitives.workspace = true
 reth-primitives.workspace = true
 reth-primitives-traits.workspace = true
 reth-errors.workspace = true
 reth-chainspec.workspace = true
-reth-consensus-common.workspace = true
 reth-fs-util.workspace = true
 reth-engine-primitives.workspace = true
 reth-evm.workspace = true
 reth-revm.workspace = true
 reth-provider.workspace = true
-reth-ethereum-forks.workspace = true
-revm-primitives.workspace = true
-revm-database.workspace = true
-reth-trie.workspace = true
 reth-payload-primitives.workspace = true
 
 # alloy
-alloy-eips.workspace = true
-alloy-primitives.workspace = true
 alloy-rpc-types-engine.workspace = true
 alloy-consensus.workspace = true