chore: bump MSRV to 1.86 (paradigmxyz#15863)

Co-authored-by: Matthias Seitz <[email protected]>

Author: klkvr

.github/workflows/lint.yml

@@ -121,7 +121,7 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.85" # MSRV
+          toolchain: "1.86" # MSRV
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace.package]
 version = "1.3.12"
 edition = "2021"
-rust-version = "1.85"
+rust-version = "1.86"
 license = "MIT OR Apache-2.0"
 homepage = "https://paradigmxyz.github.io/reth"
 repository = "https://github.com/paradigmxyz/reth"

Dockerfile.reproducible

@@ -1,5 +1,5 @@
-# Use the Rust 1.85 image based on Debian Bullseye
-FROM rust:1.85-bullseye AS builder
+# Use the Rust 1.86 image based on Debian Bullseye
+FROM rust:1.86-bullseye AS builder
 
 # Install specific version of libclang-dev
 RUN apt-get update && apt-get install -y libclang-dev=1:11.0-51+nmu5

README.md

@@ -88,7 +88,7 @@ When updating this, also update:
 - .github/workflows/lint.yml
 -->
 
-The Minimum Supported Rust Version (MSRV) of this project is [1.85.0](https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html).
+The Minimum Supported Rust Version (MSRV) of this project is [1.86.0](https://blog.rust-lang.org/2025/04/03/Rust-1.86.0/).
 
 See the book for detailed instructions on how to [build from source](https://paradigmxyz.github.io/reth/installation/source.html).
 

clippy.toml

@@ -1,4 +1,4 @@
-msrv = "1.85"
+msrv = "1.86"
 too-large-for-stack = 128
 doc-valid-idents = [
     "P2P",

crates/consensus/consensus/src/lib.rs

@@ -11,7 +11,7 @@
 
 extern crate alloc;
 
-use alloc::{fmt::Debug, string::String, sync::Arc, vec::Vec};
+use alloc::{fmt::Debug, string::String, vec::Vec};
 use alloy_consensus::Header;
 use alloy_primitives::{BlockHash, BlockNumber, Bloom, B256, U256};
 use reth_execution_types::BlockExecutionResult;
@@ -32,7 +32,7 @@ pub mod test_utils;
 /// [`Consensus`] implementation which knows full node primitives and is able to validation block's
 /// execution outcome.
 #[auto_impl::auto_impl(&, Arc)]
-pub trait FullConsensus<N: NodePrimitives>: AsConsensus<N::Block> {
+pub trait FullConsensus<N: NodePrimitives>: Consensus<N::Block> {
     /// Validate a block considering world state, i.e. things that can not be checked before
     /// execution.
     ///
@@ -48,7 +48,7 @@ pub trait FullConsensus<N: NodePrimitives>: AsConsensus<N::Block> {
 
 /// Consensus is a protocol that chooses canonical chain.
 #[auto_impl::auto_impl(&, Arc)]
-pub trait Consensus<B: Block>: AsHeaderValidator<B::Header> {
+pub trait Consensus<B: Block>: HeaderValidator<B::Header> {
     /// The error type related to consensus.
     type Error;
 
@@ -135,40 +135,6 @@ pub trait HeaderValidator<H = Header>: Debug + Send + Sync {
     ) -> Result<(), ConsensusError>;
 }
 
-/// Helper trait to cast `Arc<dyn Consensus>` to `Arc<dyn HeaderValidator>`
-pub trait AsHeaderValidator<H>: HeaderValidator<H> {
-    /// Converts the [`Arc`] of self to [`Arc`] of [`HeaderValidator`]
-    fn as_header_validator<'a>(self: Arc<Self>) -> Arc<dyn HeaderValidator<H> + 'a>
-    where
-        Self: 'a;
-}
-
-impl<T: HeaderValidator<H>, H> AsHeaderValidator<H> for T {
-    fn as_header_validator<'a>(self: Arc<Self>) -> Arc<dyn HeaderValidator<H> + 'a>
-    where
-        Self: 'a,
-    {
-        self
-    }
-}
-
-/// Helper trait to cast `Arc<dyn FullConsensus>` to `Arc<dyn Consensus>`
-pub trait AsConsensus<B: Block>: Consensus<B> {
-    /// Converts the [`Arc`] of self to [`Arc`] of [`HeaderValidator`]
-    fn as_consensus<'a>(self: Arc<Self>) -> Arc<dyn Consensus<B, Error = Self::Error> + 'a>
-    where
-        Self: 'a;
-}
-
-impl<T: Consensus<B>, B: Block> AsConsensus<B> for T {
-    fn as_consensus<'a>(self: Arc<Self>) -> Arc<dyn Consensus<B, Error = Self::Error> + 'a>
-    where
-        Self: 'a,
-    {
-        self
-    }
-}
-
 /// Consensus Errors
 #[derive(Debug, PartialEq, Eq, Clone, thiserror::Error)]
 pub enum ConsensusError {

crates/engine/service/src/service.rs

@@ -98,7 +98,7 @@ where
         let engine_kind =
             if chain_spec.is_optimism() { EngineApiKind::OpStack } else { EngineApiKind::Ethereum };
 
-        let downloader = BasicBlockDownloader::new(client, consensus.clone().as_consensus());
+        let downloader = BasicBlockDownloader::new(client, consensus.clone());
 
         let persistence_handle =
             PersistenceHandle::<EthPrimitives>::spawn_service(provider, pruner, sync_metrics_tx);

crates/ethereum/cli/src/debug_cmd/execution.rs

@@ -75,11 +75,11 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>> Command<C> {
     {
         // building network downloaders using the fetch client
         let header_downloader = ReverseHeadersDownloaderBuilder::new(config.stages.headers)
-            .build(client.clone(), consensus.clone().as_header_validator())
+            .build(client.clone(), consensus.clone())
             .into_task_with(task_executor);
 
         let body_downloader = BodiesDownloaderBuilder::new(config.stages.bodies)
-            .build(client, consensus.clone().as_consensus(), provider_factory.clone())
+            .build(client, consensus.clone(), provider_factory.clone())
             .into_task_with(task_executor);
 
         let stage_conf = &config.stages;

crates/node/builder/src/setup.rs

@@ -45,11 +45,11 @@ where
 {
     // building network downloaders using the fetch client
     let header_downloader = ReverseHeadersDownloaderBuilder::new(config.headers)
-        .build(client.clone(), consensus.clone().as_header_validator())
+        .build(client.clone(), consensus.clone())
         .into_task_with(task_executor);
 
     let body_downloader = BodiesDownloaderBuilder::new(config.bodies)
-        .build(client, consensus.clone().as_consensus(), provider_factory.clone())
+        .build(client, consensus.clone(), provider_factory.clone())
         .into_task_with(task_executor);
 
     let pipeline = build_pipeline(

crates/stages/stages/src/lib.rs

@@ -38,12 +38,12 @@
 //! # let consensus: Arc<dyn FullConsensus<reth_ethereum_primitives::EthPrimitives, Error = ConsensusError>> = Arc::new(TestConsensus::default());
 //! # let headers_downloader = ReverseHeadersDownloaderBuilder::default().build(
 //! #    Arc::new(TestHeadersClient::default()),
-//! #    consensus.clone().as_header_validator()
+//! #    consensus.clone()
 //! # );
 //! # let provider_factory = create_test_provider_factory();
 //! # let bodies_downloader = BodiesDownloaderBuilder::default().build(
 //! #    Arc::new(TestBodiesClient { responder: |_| Ok((PeerId::ZERO, vec![]).into()) }),
-//! #    consensus.clone().as_consensus(),
+//! #    consensus.clone(),
 //! #    provider_factory.clone()
 //! # );
 //! # let (tip_tx, tip_rx) = watch::channel(B256::default());

crates/stages/stages/src/sets.rs

@@ -120,7 +120,7 @@ where
             online: OnlineStages::new(
                 provider,
                 tip,
-                consensus.clone().as_consensus(),
+                consensus.clone(),
                 header_downloader,
                 body_downloader,
                 stages_config.clone(),
@@ -255,7 +255,7 @@ where
                 provider,
                 header_downloader,
                 tip,
-                consensus.clone().as_header_validator(),
+                consensus.clone(),
                 stages_config.etl,
             ))
             .add_stage(bodies)
@@ -276,7 +276,7 @@ where
                 self.provider,
                 self.header_downloader,
                 self.tip,
-                self.consensus.clone().as_header_validator(),
+                self.consensus.clone(),
                 self.stages_config.etl.clone(),
             ))
             .add_stage(BodyStage::new(self.body_downloader))