feat(snap): add EIP-8189 state bootstrap

.github/scripts/check_wasm.sh

@@ -65,6 +65,7 @@ exclude_crates=(
   reth-prune-static-files # reth-provider
   reth-tasks # tokio rt-multi-thread
   reth-stages-api # reth-provider, reth-prune
+  reth-snap-sync # reth-provider, reth-network-p2p
   reth-static-file # tokio
   reth-transaction-pool # c-kzg
   reth-payload-util # reth-transaction-pool

Cargo.toml

@@ -91,6 +91,7 @@ members = [
     "crates/rpc/rpc-e2e-tests/",
     "crates/rpc/rpc-convert/",
     "crates/rpc/rpc/",
+    "crates/snap-sync/",
     "crates/stages/api/",
     "crates/stages/stages/",
     "crates/stages/types/",
@@ -409,6 +410,7 @@ reth-rpc-layer = { path = "crates/rpc/rpc-layer" }
 reth-rpc-server-types = { path = "crates/rpc/rpc-server-types" }
 reth-rpc-convert = { path = "crates/rpc/rpc-convert" }
 reth-rpc-traits = { version = "0.6.0", default-features = false }
+reth-snap-sync = { path = "crates/snap-sync" }
 reth-stages = { path = "crates/stages/stages" }
 reth-stages-api = { path = "crates/stages/api" }
 reth-stages-types = { path = "crates/stages/types", default-features = false }

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

@@ -4,7 +4,8 @@ use alloy_rpc_types_engine::PayloadAttributes;
 use node::NodeTestContext;
 use reth_chainspec::ChainSpec;
 use reth_db::{test_utils::TempDatabase, DatabaseEnv};
-use reth_network_api::test_utils::PeersHandleProvider;
+use reth_network_api::{test_utils::PeersHandleProvider, BlockDownloaderProvider};
+use reth_network_p2p::snap::client::SnapClient;
 use reth_node_builder::{
     components::NodeComponentsBuilder,
     rpc::{EngineValidatorAddOn, RethRpcAddOns},
@@ -153,7 +154,7 @@ where
                 TmpNodeAdapter<Self, BlockchainProvider<NodeTypesWithDBAdapter<Self, TmpDB>>>,
                 Components: NodeComponents<
                     TmpNodeAdapter<Self, BlockchainProvider<NodeTypesWithDBAdapter<Self, TmpDB>>>,
-                    Network: PeersHandleProvider,
+                    Network: PeersHandleProvider + BlockDownloaderProvider<Client: SnapClient>,
                 >,
             >,
             AddOns: RethRpcAddOns<
@@ -175,7 +176,7 @@ impl<T> NodeBuilderHelper for T where
                 TmpNodeAdapter<Self, BlockchainProvider<NodeTypesWithDBAdapter<Self, TmpDB>>>,
                 Components: NodeComponents<
                     TmpNodeAdapter<Self, BlockchainProvider<NodeTypesWithDBAdapter<Self, TmpDB>>>,
-                    Network: PeersHandleProvider,
+                    Network: PeersHandleProvider + BlockDownloaderProvider<Client: SnapClient>,
                 >,
             >,
             AddOns: RethRpcAddOns<

crates/engine/tree/Cargo.toml

@@ -35,7 +35,7 @@ reth-tasks = { workspace = true, features = ["rayon"] }
 reth-trie-parallel.workspace = true
 reth-trie-sparse = { workspace = true, features = ["std", "metrics"] }
 reth-trie.workspace = true
-reth-trie-common.workspace = true
+reth-trie-common = { workspace = true, features = ["eip7928"] }
 
 # alloy
 alloy-evm.workspace = true

crates/engine/tree/src/launch.rs

@@ -5,7 +5,7 @@
 //! [`ChainOrchestrator`](crate::chain::ChainOrchestrator) ready to be polled as a `Stream`.
 
 use crate::{
-    backfill::PipelineSync,
+    backfill::BackfillSync,
     chain::ChainOrchestrator,
     download::BasicBlockDownloader,
     engine::{EngineApiKind, EngineApiRequest, EngineApiRequestHandler, EngineHandler},
@@ -24,7 +24,7 @@ use reth_provider::{
     ProviderFactory,
 };
 use reth_prune::PrunerWithFactory;
-use reth_stages_api::{MetricEventsSender, Pipeline};
+use reth_stages_api::MetricEventsSender;
 use reth_storage_overlay::OverlayManager;
 use reth_tasks::Runtime;
 use std::sync::Arc;
@@ -40,21 +40,20 @@ use std::sync::Arc;
 ///   (`newPayload`, `forkchoiceUpdated`) and maintains the in-memory chain state.
 /// - **[`EngineApiRequestHandler`]** + **[`EngineHandler`]** — glue that routes incoming CL
 ///   messages to the tree handler and manages download requests.
-/// - **[`PipelineSync`]** — wraps the staged sync [`Pipeline`] for backfill sync when the node
-///   needs to catch up over large block ranges.
+/// - **[`BackfillSync`]** — drives the configured backfill implementation when the node needs to
+///   catch up over large block ranges.
 ///
 /// The returned orchestrator implements [`Stream`] and yields
 /// [`ChainEvent`]s.
 ///
 /// [`ChainEvent`]: crate::chain::ChainEvent
 #[expect(clippy::too_many_arguments, clippy::type_complexity)]
-pub fn build_engine_orchestrator<N, Client, S, V, C>(
+pub fn build_engine_orchestrator<N, Client, S, V, C, B>(
     engine_kind: EngineApiKind,
     consensus: Arc<dyn FullConsensus<N::Primitives>>,
     client: Client,
     incoming_requests: S,
-    pipeline: Pipeline<N>,
-    pipeline_task_spawner: Runtime,
+    backfill_sync: B,
     provider: ProviderFactory<N>,
     blockchain_db: BlockchainProvider<N>,
     pruner: PrunerWithFactory<ProviderFactory<N>>,
@@ -71,14 +70,15 @@ pub fn build_engine_orchestrator<N, Client, S, V, C>(
         S,
         BasicBlockDownloader<Client, <N::Primitives as NodePrimitives>::Block>,
     >,
-    PipelineSync<N>,
+    B,
 >
 where
     N: ProviderNodeTypes,
     Client: BlockClient<Block = <N::Primitives as NodePrimitives>::Block> + 'static,
     S: Stream<Item = BeaconEngineMessage<N::Payload>> + Send + Sync + Unpin + 'static,
     V: EngineValidator<N::Payload> + WaitForCaches,
     C: ConfigureEvm<Primitives = N::Primitives> + 'static,
+    B: BackfillSync + Unpin,
 {
     let downloader = BasicBlockDownloader::new(client, consensus.clone());
 
@@ -104,7 +104,5 @@ where
     let engine_handler = EngineApiRequestHandler::new(to_tree_tx, from_tree);
     let handler = EngineHandler::new(engine_handler, downloader, incoming_requests);
 
-    let backfill_sync = PipelineSync::new(pipeline, pipeline_task_spawner);
-
     ChainOrchestrator::new(handler, backfill_sync)
 }