chore(deps): bump alloy

Cargo.toml

@@ -407,47 +407,48 @@ revm-primitives = { version = "8.0.0", features = [
 
 # eth
 alloy-chains = "0.1.18"
-alloy-dyn-abi = "0.7.2"
-alloy-primitives = { version = "0.7.2", default-features = false }
+alloy-dyn-abi = "0.8.0"
+alloy-primitives = { version = "0.8.0", default-features = false }
 alloy-rlp = "0.3.4"
-alloy-sol-types = "0.7.2"
-alloy-trie = { version = "0.4", default-features = false }
+alloy-sol-types = "0.8.0"
+alloy-trie = { version = "0.5", default-features = false }
 
-alloy-consensus = { version = "0.2.1", default-features = false }
-alloy-eips = { version = "0.2.1", default-features = false }
-alloy-genesis = { version = "0.2.1", default-features = false }
-alloy-json-rpc = { version = "0.2.1", default-features = false }
-alloy-network = { version = "0.2.1", default-features = false }
-alloy-node-bindings = { version = "0.2.1", default-features = false }
-alloy-provider = { version = "0.2.1", features = [
+alloy-consensus = { version = "0.3.0", default-features = false }
+alloy-eips = { version = "0.3.0", default-features = false }
+alloy-genesis = { version = "0.3.0", default-features = false }
+alloy-json-rpc = { version = "0.3.0", default-features = false }
+alloy-network = { version = "0.3.0", default-features = false }
+alloy-node-bindings = { version = "0.3.0", default-features = false }
+alloy-provider = { version = "0.3.0", features = [
     "reqwest",
 ], default-features = false }
-alloy-pubsub = { version = "0.2.1", default-features = false }
-alloy-rpc-client = { version = "0.2.1", default-features = false }
-alloy-rpc-types = { version = "0.2.1", features = [
+alloy-pubsub = { version = "0.3.0", default-features = false }
+alloy-rpc-client = { version = "0.3.0", default-features = false }
+alloy-rpc-types = { version = "0.3.0", features = [
     "eth",
 ], default-features = false }
-alloy-rpc-types-admin = { version = "0.2.1", default-features = false }
-alloy-rpc-types-anvil = { version = "0.2.1", default-features = false }
-alloy-rpc-types-beacon = { version = "0.2.1", default-features = false }
-alloy-rpc-types-engine = { version = "0.2.1", default-features = false }
-alloy-rpc-types-eth = { version = "0.2.1", default-features = false }
-alloy-rpc-types-mev = { version = "0.2.1", default-features = false }
-alloy-rpc-types-trace = { version = "0.2.1", default-features = false }
-alloy-rpc-types-txpool = { version = "0.2.1", default-features = false }
-alloy-serde = { version = "0.2.1", default-features = false }
-alloy-signer = { version = "0.2.1", default-features = false }
-alloy-signer-local = { version = "0.2.1", default-features = false }
-alloy-transport = { version = "0.2.1" }
-alloy-transport-http = { version = "0.2.1", features = [
+alloy-rpc-types-admin = { version = "0.3.0", default-features = false }
+alloy-rpc-types-anvil = { version = "0.3.0", default-features = false }
+alloy-rpc-types-beacon = { version = "0.3.0", default-features = false }
+alloy-rpc-types-engine = { version = "0.3.0", default-features = false }
+alloy-rpc-types-eth = { version = "0.3.0", default-features = false }
+alloy-rpc-types-mev = { version = "0.3.0", default-features = false }
+alloy-rpc-types-trace = { version = "0.3.0", default-features = false }
+alloy-rpc-types-txpool = { version = "0.3.0", default-features = false }
+alloy-serde = { version = "0.3.0", default-features = false }
+alloy-signer = { version = "0.3.0", default-features = false }
+alloy-signer-local = { version = "0.3.0", default-features = false }
+alloy-transport = { version = "0.3.0" }
+alloy-transport-http = { version = "0.3.0", features = [
     "reqwest-rustls-tls",
 ], default-features = false }
-alloy-transport-ipc = { version = "0.2.1", default-features = false }
-alloy-transport-ws = { version = "0.2.1", default-features = false }
+alloy-transport-ipc = { version = "0.3.0", default-features = false }
+alloy-transport-ws = { version = "0.3.0", default-features = false }
 
 # op
-op-alloy-rpc-types = "0.1"
-op-alloy-network = "0.1"
+op-alloy-rpc-types = "0.2"
+op-alloy-rpc-types-engine = "0.2"
+op-alloy-network = "0.2"
 
 # misc
 aquamarine = "0.5"
@@ -561,3 +562,8 @@ serial_test = "3"
 similar-asserts = "1.5.0"
 tempfile = "3.8"
 test-fuzz = "5"
+
+[patch.crates-io]
+revm = { git = "https://github.com/klkvr/revm", rev = "84839ba" }
+revm-primitives = { git = "https://github.com/klkvr/revm", rev = "84839ba" }
+revm-inspectors = { git = "https://github.com/klkvr/evm-inspectors", rev = "4674d04" }

bin/reth-bench/src/bench/context.rs

@@ -3,10 +3,7 @@
 
 use crate::{authenticated_transport::AuthenticatedTransportConnect, bench_mode::BenchMode};
 use alloy_eips::BlockNumberOrTag;
-use alloy_provider::{
-    network::{AnyNetwork, Ethereum},
-    Provider, ProviderBuilder, RootProvider,
-};
+use alloy_provider::{network::AnyNetwork, Provider, ProviderBuilder, RootProvider};
 use alloy_rpc_client::ClientBuilder;
 use alloy_rpc_types_engine::JwtSecret;
 use alloy_transport::BoxTransport;
@@ -24,7 +21,7 @@ pub(crate) struct BenchContext {
     /// The auth provider used for engine API queries.
     pub(crate) auth_provider: RootProvider<BoxTransport, AnyNetwork>,
     /// The block provider used for block queries.
-    pub(crate) block_provider: RootProvider<Http<Client>, Ethereum>,
+    pub(crate) block_provider: RootProvider<Http<Client>, AnyNetwork>,
     /// The benchmark mode, which defines whether the benchmark should run for a closed or open
     /// range of blocks.
     pub(crate) benchmark_mode: BenchMode,
@@ -46,7 +43,8 @@ impl BenchContext {
         }
 
         // set up alloy client for blocks
-        let block_provider = ProviderBuilder::new().on_http(rpc_url.parse()?);
+        let block_provider =
+            ProviderBuilder::new().network::<AnyNetwork>().on_http(rpc_url.parse()?);
 
         // If neither `--from` nor `--to` are provided, we will run the benchmark continuously,
         // starting at the latest block.
@@ -95,17 +93,7 @@ impl BenchContext {
             }
         };
 
-        let next_block = match first_block.header.number {
-            Some(number) => {
-                // fetch next block
-                number + 1
-            }
-            None => {
-                // this should never happen
-                return Err(eyre::eyre!("First block number is None"));
-            }
-        };
-
+        let next_block = first_block.header.number + 1;
         Ok(Self { auth_provider, block_provider, benchmark_mode, next_block })
     }
 }

bin/reth-bench/src/bench/new_payload_fcu.rs

@@ -45,17 +45,8 @@ impl Command {
             while benchmark_mode.contains(next_block) {
                 let block_res = block_provider.get_block_by_number(next_block.into(), true).await;
                 let block = block_res.unwrap().unwrap();
-                let block = match block.header.hash {
-                    Some(block_hash) => {
-                        // we can reuse the hash in the response
-                        Block::try_from(block).unwrap().seal(block_hash)
-                    }
-                    None => {
-                        // we don't have the hash, so let's just hash it
-                        Block::try_from(block).unwrap().seal_slow()
-                    }
-                };
-
+                let block_hash = block.header.hash;
+                let block = Block::try_from(block.inner).unwrap().seal(block_hash);
                 let head_block_hash = block.hash();
                 let safe_block_hash = block_provider
                     .get_block_by_number(block.number.saturating_sub(32).into(), false);
@@ -65,18 +56,9 @@ impl Command {
 
                 let (safe, finalized) = tokio::join!(safe_block_hash, finalized_block_hash,);
 
-                let safe_block_hash = safe
-                    .unwrap()
-                    .expect("finalized block exists")
-                    .header
-                    .hash
-                    .expect("finalized block has hash");
-                let finalized_block_hash = finalized
-                    .unwrap()
-                    .expect("finalized block exists")
-                    .header
-                    .hash
-                    .expect("finalized block has hash");
+                let safe_block_hash = safe.unwrap().expect("finalized block exists").header.hash;
+                let finalized_block_hash =
+                    finalized.unwrap().expect("finalized block exists").header.hash;
 
                 next_block += 1;
                 sender

bin/reth-bench/src/bench/new_payload_only.rs

@@ -45,16 +45,8 @@ impl Command {
             while benchmark_mode.contains(next_block) {
                 let block_res = block_provider.get_block_by_number(next_block.into(), true).await;
                 let block = block_res.unwrap().unwrap();
-                let block = match block.header.hash {
-                    Some(block_hash) => {
-                        // we can reuse the hash in the response
-                        Block::try_from(block).unwrap().seal(block_hash)
-                    }
-                    None => {
-                        // we don't have the hash, so let's just hash it
-                        Block::try_from(block).unwrap().seal_slow()
-                    }
-                };
+                let block_hash = block.header.hash;
+                let block = Block::try_from(block.inner).unwrap().seal(block_hash);
 
                 next_block += 1;
                 sender.send(block).await.unwrap();

bin/reth/src/commands/debug_cmd/build_block.rs

@@ -224,7 +224,7 @@ impl Command {
             #[cfg(feature = "optimism")]
             reth_node_optimism::OptimismPayloadBuilderAttributes::try_new(
                 best_block.hash(),
-                reth_rpc_types::engine::OptimismPayloadAttributes {
+                reth_rpc_types::optimism::OptimismPayloadAttributes {
                     payload_attributes: payload_attrs,
                     transactions: None,
                     no_tx_pool: None,

crates/consensus/debug-client/src/client.rs

@@ -47,7 +47,7 @@ pub trait BlockProvider: Send + Sync + 'static {
                 None => return Ok(B256::default()),
             };
             let block = self.get_block(previous_block_number).await?;
-            block.header.hash.ok_or_else(|| eyre::eyre!("previous block does not have hash"))
+            Ok(block.header.hash)
         }
     }
 }
@@ -198,13 +198,13 @@ pub fn block_to_execution_payload_v3(block: Block) -> ExecutionNewPayload {
                 receipts_root: block.header.receipts_root,
                 logs_bloom: block.header.logs_bloom,
                 prev_randao: block.header.mix_hash.unwrap(),
-                block_number: block.header.number.unwrap(),
+                block_number: block.header.number,
                 gas_limit: block.header.gas_limit.try_into().unwrap(),
                 gas_used: block.header.gas_used.try_into().unwrap(),
                 timestamp: block.header.timestamp,
                 extra_data: block.header.extra_data.clone(),
                 base_fee_per_gas: block.header.base_fee_per_gas.unwrap().try_into().unwrap(),
-                block_hash: block.header.hash.unwrap(),
+                block_hash: block.header.hash,
                 transactions: transactions
                     .into_iter()
                     .map(|tx| {

crates/consensus/debug-client/src/providers/etherscan.rs

@@ -63,7 +63,7 @@ impl BlockProvider for EtherscanBlockProvider {
                     continue
                 }
             };
-            let block_number = block.header.number.unwrap();
+            let block_number = block.header.number;
             if Some(block_number) == last_block_number {
                 continue;
             }

crates/consensus/debug-client/src/providers/rpc.rs

@@ -33,7 +33,7 @@ impl BlockProvider for RpcBlockProvider {
 
         while let Some(block) = stream.next().await {
             let full_block = ws_provider
-                .get_block_by_hash(block.header.hash.unwrap(), BlockTransactionsKind::Full)
+                .get_block_by_hash(block.header.hash, BlockTransactionsKind::Full)
                 .await
                 .expect("failed to get block")
                 .expect("block not found");

crates/e2e-test-utils/src/lib.rs

@@ -59,7 +59,9 @@ where
     N::AddOns: NodeAddOns<
         Adapter<N>,
         EthApi: FullEthApiServer<
-            NetworkTypes: Network<TransactionResponse = reth_rpc_types::Transaction>,
+            NetworkTypes: Network<
+                TransactionResponse = reth_rpc_types::WithOtherFields<reth_rpc_types::Transaction>,
+            >,
         > + AddDevSigners
                     + EthApiBuilderProvider<Adapter<N>>,
     >,

crates/e2e-test-utils/src/node.rs

@@ -17,6 +17,7 @@ use reth::{
 };
 use reth_node_builder::{EthApiTypes, NodeAddOns, NodeTypes};
 use reth_primitives::{BlockHash, BlockNumber, Bytes, B256};
+use reth_rpc_types::WithOtherFields;
 use reth_stages_types::StageId;
 use tokio_stream::StreamExt;
 
@@ -94,7 +95,7 @@ where
             From<<Node::Engine as PayloadTypes>::BuiltPayload> + PayloadEnvelopeExt,
         AddOns::EthApi: EthApiSpec + EthTransactions + TraceExt,
         <AddOns::EthApi as EthApiTypes>::NetworkTypes:
-            Network<TransactionResponse = alloy_rpc_types::Transaction>,
+            Network<TransactionResponse = WithOtherFields<alloy_rpc_types::Transaction>>,
     {
         let mut chain = Vec::with_capacity(length as usize);
         for i in 0..length {

crates/e2e-test-utils/src/rpc.rs

@@ -9,6 +9,7 @@ use reth::{
 };
 use reth_node_builder::EthApiTypes;
 use reth_primitives::{Bytes, B256};
+use reth_rpc_types::WithOtherFields;
 
 #[allow(missing_debug_implementations)]
 pub struct RpcTestContext<Node: FullNodeComponents, EthApi: EthApiTypes> {
@@ -19,8 +20,11 @@ impl<Node, EthApi> RpcTestContext<Node, EthApi>
 where
     Node: FullNodeComponents,
     EthApi: EthApiSpec
-        + EthTransactions<NetworkTypes: Network<TransactionResponse = alloy_rpc_types::Transaction>>
-        + TraceExt,
+        + EthTransactions<
+            NetworkTypes: Network<
+                TransactionResponse = WithOtherFields<alloy_rpc_types::Transaction>,
+            >,
+        > + TraceExt,
 {
     /// Injects a raw transaction into the node tx pool via RPC server
     pub async fn inject_tx(&self, raw_tx: Bytes) -> Result<B256, EthApi::Error> {

crates/e2e-test-utils/src/traits.rs

@@ -1,5 +1,5 @@
 use reth::rpc::types::{
-    engine::{ExecutionPayloadEnvelopeV3, OptimismExecutionPayloadEnvelopeV3},
+    engine::ExecutionPayloadEnvelopeV3, optimism::OptimismExecutionPayloadEnvelopeV3,
     ExecutionPayloadV3,
 };
 

crates/ethereum/evm/src/lib.rs

@@ -203,9 +203,6 @@ mod tests {
         // Ensure that the logs database is empty
         assert!(evm.context.evm.inner.db.logs.is_empty());
 
-        // Ensure that there are no valid authorizations in the EVM context
-        assert!(evm.context.evm.inner.valid_authorizations.is_empty());
-
         // No Optimism
         assert_eq!(evm.handler.cfg, HandlerCfg { spec_id: SpecId::LATEST, ..Default::default() });
     }
@@ -357,9 +354,6 @@ mod tests {
         // Ensure that the logs database is empty
         assert!(evm.context.evm.inner.db.logs.is_empty());
 
-        // Ensure that there are no valid authorizations in the EVM context
-        assert!(evm.context.evm.inner.valid_authorizations.is_empty());
-
         // No Optimism
         assert_eq!(evm.handler.cfg, HandlerCfg { spec_id: SpecId::LATEST, ..Default::default() });
     }

crates/node/builder/src/builder/mod.rs

@@ -5,6 +5,7 @@
 pub mod add_ons;
 mod states;
 
+use reth_rpc_types::WithOtherFields;
 pub use states::*;
 
 use std::sync::Arc;
@@ -330,7 +331,7 @@ where
                     >
                         + FullEthApiServer<
                             NetworkTypes: alloy_network::Network<
-                                TransactionResponse = reth_rpc_types::Transaction
+                                TransactionResponse = WithOtherFields<reth_rpc_types::Transaction>,
                             >,
                         >
                         + AddDevSigners
@@ -479,7 +480,9 @@ where
         NodeAdapter<RethFullAdapter<DB, T>, CB::Components>,
         EthApi: EthApiBuilderProvider<NodeAdapter<RethFullAdapter<DB, T>, CB::Components>>
                     + FullEthApiServer<
-            NetworkTypes: alloy_network::Network<TransactionResponse = reth_rpc_types::Transaction>,
+            NetworkTypes: alloy_network::Network<
+                TransactionResponse = WithOtherFields<reth_rpc_types::Transaction>,
+            >,
         > + AddDevSigners,
     >,
 {

crates/node/builder/src/launch/engine.rs

@@ -27,7 +27,7 @@ use reth_node_core::{
 use reth_node_events::{cl::ConsensusLayerHealthEvents, node};
 use reth_provider::providers::BlockchainProvider2;
 use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi};
-use reth_rpc_types::engine::ClientVersionV1;
+use reth_rpc_types::{engine::ClientVersionV1, WithOtherFields};
 use reth_tasks::TaskExecutor;
 use reth_tokio_util::EventSender;
 use reth_tracing::tracing::{debug, error, info};
@@ -67,7 +67,9 @@ where
         NodeAdapter<T, CB::Components>,
         EthApi: EthApiBuilderProvider<NodeAdapter<T, CB::Components>>
                     + FullEthApiServer<
-            NetworkTypes: alloy_network::Network<TransactionResponse = reth_rpc_types::Transaction>,
+            NetworkTypes: alloy_network::Network<
+                TransactionResponse = WithOtherFields<reth_rpc_types::Transaction>,
+            >,
         > + AddDevSigners,
     >,
 {

crates/node/builder/src/launch/mod.rs

@@ -32,7 +32,7 @@ use reth_node_events::{cl::ConsensusLayerHealthEvents, node};
 use reth_primitives::format_ether;
 use reth_provider::providers::BlockchainProvider;
 use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi};
-use reth_rpc_types::engine::ClientVersionV1;
+use reth_rpc_types::{engine::ClientVersionV1, WithOtherFields};
 use reth_tasks::TaskExecutor;
 use reth_tracing::tracing::{debug, info};
 use reth_transaction_pool::TransactionPool;
@@ -111,7 +111,9 @@ where
         NodeAdapter<T, CB::Components>,
         EthApi: EthApiBuilderProvider<NodeAdapter<T, CB::Components>>
                     + FullEthApiServer<
-            NetworkTypes: alloy_network::Network<TransactionResponse = reth_rpc_types::Transaction>,
+            NetworkTypes: alloy_network::Network<
+                TransactionResponse = WithOtherFields<reth_rpc_types::Transaction>,
+            >,
         > + AddDevSigners,
     >,
 {