feat: BlockchainTree

bin/reth/src/args/network_args.rs

@@ -7,7 +7,7 @@ use reth_net_nat::NatResolver;
 use reth_network::NetworkConfigBuilder;
 use reth_primitives::{ChainSpec, NodeRecord};
 use reth_staged_sync::Config;
-use std::path::PathBuf;
+use std::{path::PathBuf, sync::Arc};
 
 /// Parameters for configuring the network more granularity via CLI
 #[derive(Debug, Args)]
@@ -50,7 +50,11 @@ pub struct NetworkArgs {
 impl NetworkArgs {
     /// Build a [`NetworkConfigBuilder`] from a [`Config`] and a [`ChainSpec`], in addition to the
     /// values in this option struct.
-    pub fn network_config(&self, config: &Config, chain_spec: ChainSpec) -> NetworkConfigBuilder {
+    pub fn network_config(
+        &self,
+        config: &Config,
+        chain_spec: Arc<ChainSpec>,
+    ) -> NetworkConfigBuilder {
         let peers_file = (!self.no_persist_peers).then_some(&self.peers_file);
         let network_config_builder = config
             .network_config(self.nat, peers_file.map(|f| f.as_ref().to_path_buf()))

bin/reth/src/chain/import.rs

@@ -63,7 +63,7 @@ pub struct ImportCommand {
         default_value = "mainnet",
         value_parser = genesis_value_parser
     )]
-    chain: ChainSpec,
+    chain: Arc<ChainSpec>,
 
     /// The path to a block file for import.
     ///
@@ -140,7 +140,7 @@ impl ImportCommand {
             .build(file_client.clone(), consensus.clone(), db)
             .into_task();
 
-        let factory = reth_executor::Factory::new(Arc::new(self.chain.clone()));
+        let factory = reth_executor::Factory::new(self.chain.clone());
 
         let mut pipeline = Pipeline::builder()
             .with_sync_state_updater(file_client)

bin/reth/src/chain/init.rs

@@ -36,7 +36,7 @@ pub struct InitCommand {
         default_value = "mainnet",
         value_parser = genesis_value_parser
     )]
-    chain: ChainSpec,
+    chain: Arc<ChainSpec>,
 }
 
 impl InitCommand {

bin/reth/src/db/mod.rs

@@ -207,8 +207,8 @@ impl<'a, DB: Database> DbTool<'a, DB> {
         let chain = random_block_range(0..len, Default::default(), 0..64);
 
         self.db.update(|tx| {
-            chain.iter().try_for_each(|block| {
-                insert_canonical_block(tx, block, true)?;
+            chain.into_iter().try_for_each(|block| {
+                insert_canonical_block(tx, block, None, true)?;
                 Ok::<_, eyre::Error>(())
             })
         })??;

bin/reth/src/node/mod.rs

@@ -90,7 +90,7 @@ pub struct Command {
         default_value = "mainnet",
         value_parser = genesis_value_parser
     )]
-    chain: ChainSpec,
+    chain: Arc<ChainSpec>,
 
     /// Enable Prometheus metrics.
     ///
@@ -443,7 +443,7 @@ impl Command {
             builder = builder.with_max_block(max_block)
         }
 
-        let factory = reth_executor::Factory::new(Arc::new(self.chain.clone()));
+        let factory = reth_executor::Factory::new(self.chain.clone());
         let pipeline = builder
             .with_sync_state_updater(updater.clone())
             .add_stages(

bin/reth/src/p2p/mod.rs

@@ -39,7 +39,7 @@ pub struct Command {
         default_value = "mainnet",
         value_parser = chain_spec_value_parser
     )]
-    chain: ChainSpec,
+    chain: Arc<ChainSpec>,
 
     /// Disable the discovery service.
     #[command(flatten)]

bin/reth/src/stage/mod.rs

@@ -54,7 +54,7 @@ pub struct Command {
         default_value = "mainnet",
         value_parser = chain_spec_value_parser
     )]
-    chain: ChainSpec,
+    chain: Arc<ChainSpec>,
 
     /// Enable Prometheus metrics.
     ///
@@ -171,7 +171,7 @@ impl Command {
                 stage.execute(&mut tx, input).await?;
             }
             StageEnum::Execution => {
-                let factory = reth_executor::Factory::new(Arc::new(self.chain.clone()));
+                let factory = reth_executor::Factory::new(self.chain.clone());
                 let mut stage = ExecutionStage::new(factory, 10_000);
                 stage.commit_threshold = num_blocks;
                 if !self.skip_unwind {

bin/reth/src/test_eth_chain/runner.rs

@@ -140,13 +140,13 @@ pub async fn run_test(path: PathBuf) -> eyre::Result<TestOutcome> {
         // insert genesis
         let header: SealedHeader = suite.genesis_block_header.into();
         let genesis_block = SealedBlock { header, body: vec![], ommers: vec![], withdrawals: None };
-        reth_provider::insert_canonical_block(&tx, &genesis_block, has_block_reward)?;
+        reth_provider::insert_canonical_block(&tx, genesis_block, None, has_block_reward)?;
 
         let mut last_block = None;
         suite.blocks.iter().try_for_each(|block| -> eyre::Result<()> {
             let decoded = SealedBlock::decode(&mut block.rlp.as_ref())?;
-            reth_provider::insert_canonical_block(&tx, &decoded, has_block_reward)?;
             last_block = Some(decoded.number);
+            reth_provider::insert_canonical_block(&tx, decoded, None, has_block_reward)?;
             Ok(())
         })?;
 

crates/consensus/src/beacon/beacon_consensus.rs

@@ -1,4 +1,6 @@
 //! Consensus for ethereum network
+use std::sync::Arc;
+
 use crate::validation;
 use reth_interfaces::consensus::{Consensus, ConsensusError, ForkchoiceState};
 use reth_primitives::{ChainSpec, Hardfork, SealedBlock, SealedHeader, EMPTY_OMMER_ROOT, U256};
@@ -15,13 +17,13 @@ pub struct BeaconConsensus {
     /// Watcher over the forkchoice state
     forkchoice_state_rx: watch::Receiver<ForkchoiceState>,
     /// Configuration
-    chain_spec: ChainSpec,
+    chain_spec: Arc<ChainSpec>,
 }
 
 impl BeaconConsensus {
     /// Create a new instance of [BeaconConsensus]
     pub fn new(
-        chain_spec: ChainSpec,
+        chain_spec: Arc<ChainSpec>,
         forkchoice_state_rx: watch::Receiver<ForkchoiceState>,
     ) -> Self {
         Self { chain_spec, forkchoice_state_rx }
@@ -92,14 +94,14 @@ impl Consensus for BeaconConsensus {
 
 #[cfg(test)]
 mod test {
+    use super::BeaconConsensus;
     use reth_interfaces::consensus::Consensus;
     use reth_primitives::{ChainSpecBuilder, U256};
-
-    use super::BeaconConsensus;
+    use std::sync::Arc;
 
     #[test]
     fn test_has_block_reward_before_paris() {
-        let chain_spec = ChainSpecBuilder::mainnet().build();
+        let chain_spec = Arc::new(ChainSpecBuilder::mainnet().build());
         let (consensus, _) = BeaconConsensus::builder().build(chain_spec);
         assert!(consensus.has_block_reward(U256::ZERO, U256::ZERO));
     }

crates/consensus/src/beacon/builder.rs

@@ -13,7 +13,7 @@ impl BeaconConsensusBuilder {
     /// [watch::channel] for updating the forkchoice state.
     pub fn build(
         self,
-        chain_spec: ChainSpec,
+        chain_spec: Arc<ChainSpec>,
     ) -> (Arc<BeaconConsensus>, watch::Sender<ForkchoiceState>) {
         let (forkchoice_state_tx, forkchoice_state_rx) = watch::channel(ForkchoiceState::default());
         let inner = Arc::new(BeaconConsensus::new(chain_spec, forkchoice_state_rx));

crates/executor/Cargo.toml

@@ -6,6 +6,12 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/paradigmxyz/reth"
 readme = "README.md"
 
+[package.metadata.cargo-udeps.ignore]
+normal = [
+    # Used for diagrams in docs
+    "aquamarine",
+]
+
 [dependencies]
 # reth 
 reth-primitives = { path = "../primitives" }
@@ -17,7 +23,7 @@ reth-db = { path = "../storage/db" }
 reth-provider = { path = "../storage/provider" }
 
 # revm
-revm = { version = "3.0.0"}
+revm = { version = "3.0.0" }
 
 # common
 async-trait = "0.1.57"
@@ -26,6 +32,9 @@ auto_impl = "1.0"
 tracing = "0.1.37"
 tokio = { version = "1.21.2", features = ["sync"] }
 
+# mics
+aquamarine = "0.2.1" #docs
+
 triehash = "0.8"
 # See to replace hashers to simplify libraries
 plain_hasher = "0.2"
@@ -38,3 +47,7 @@ sha3 = { version = "0.10", default-features = false }
 
 [dev-dependencies]
 reth-db = { path = "../storage/db", features = ["test-utils"] }
+reth-interfaces = { path = "../interfaces", features = ["test-utils"] }
+reth-primitives = { path = "../primitives", features = ["test-utils"] }
+reth-provider = { path = "../storage/provider", features = ["test-utils"]  }
+parking_lot = "0.12"