Merge remote-tracking branch 'upstream/main'

Author: 0xKarl98

Cargo.lock

@@ -597,6 +597,7 @@ tokio-tungstenite = "0.26.2"
 tokio-util = { version = "0.7.4", features = ["codec"] }
 
 # async
+async-compression = { version = "0.4", default-features = false }
 async-stream = "0.3"
 async-trait = "0.1.68"
 futures = "0.3"

Cargo.toml

@@ -39,6 +39,11 @@ pub trait ChainSpecParser: Clone + Send + Sync + 'static {
     /// List of supported chains.
     const SUPPORTED_CHAINS: &'static [&'static str];
 
+    /// The default value for the chain spec parser.
+    fn default_value() -> Option<&'static str> {
+        Self::SUPPORTED_CHAINS.first().copied()
+    }
+
     /// Parses the given string into a chain spec.
     ///
     /// # Arguments

crates/cli/cli/src/chainspec.rs

@@ -48,7 +48,7 @@ pub struct EnvironmentArgs<C: ChainSpecParser> {
         long,
         value_name = "CHAIN_OR_PATH",
         long_help = C::help_message(),
-        default_value = C::SUPPORTED_CHAINS[0],
+        default_value = C::default_value(),
         value_parser = C::parser(),
         global = true
     )]

crates/cli/commands/src/common.rs

@@ -15,7 +15,7 @@ pub struct DumpGenesisCommand<C: ChainSpecParser> {
         long,
         value_name = "CHAIN_OR_PATH",
         long_help = C::help_message(),
-        default_value = C::SUPPORTED_CHAINS[0],
+        default_value = C::default_value(),
         value_parser = C::parser()
     )]
     chain: Arc<C::ChainSpec>,

crates/cli/commands/src/dump_genesis.rs

@@ -32,7 +32,7 @@ pub struct NodeCommand<C: ChainSpecParser, Ext: clap::Args + fmt::Debug = NoArgs
         long,
         value_name = "CHAIN_OR_PATH",
         long_help = C::help_message(),
-        default_value = C::SUPPORTED_CHAINS[0],
+        default_value = C::default_value(),
         default_value_if("dev", "true", "dev"),
         value_parser = C::parser(),
         required = false,

crates/cli/commands/src/node.rs

@@ -151,7 +151,7 @@ pub struct DownloadArgs<C: ChainSpecParser> {
         long,
         value_name = "CHAIN_OR_PATH",
         long_help = C::help_message(),
-        default_value = C::SUPPORTED_CHAINS[0],
+        default_value = C::default_value(),
         value_parser = C::parser()
     )]
     chain: Arc<C::ChainSpec>,

crates/cli/commands/src/p2p/mod.rs

@@ -92,10 +92,8 @@ fn unwind_and_copy<N: ProviderNodeTypes>(
         reth_stages::ExecInput { target: Some(to), checkpoint: Some(StageCheckpoint::new(from)) };
 
     // Unwind hashes all the way to FROM
-
-    StorageHashingStage::default().unwind(&provider, unwind).unwrap();
-    AccountHashingStage::default().unwind(&provider, unwind).unwrap();
-
+    StorageHashingStage::default().unwind(&provider, unwind)?;
+    AccountHashingStage::default().unwind(&provider, unwind)?;
     MerkleStage::default_unwind().unwind(&provider, unwind)?;
 
     // Bring Plainstate to TO (hashing stage execution requires it)
@@ -127,15 +125,13 @@ fn unwind_and_copy<N: ProviderNodeTypes>(
         commit_threshold: u64::MAX,
         etl_config: EtlConfig::default(),
     }
-    .execute(&provider, execute_input)
-    .unwrap();
+    .execute(&provider, execute_input)?;
     StorageHashingStage {
         clean_threshold: u64::MAX,
         commit_threshold: u64::MAX,
         etl_config: EtlConfig::default(),
     }
-    .execute(&provider, execute_input)
-    .unwrap();
+    .execute(&provider, execute_input)?;
 
     let unwind_inner_tx = provider.into_tx();
 

crates/cli/commands/src/stage/dump/merkle.rs

@@ -17,7 +17,7 @@ pub mod unwind;
 #[derive(Debug, Parser)]
 pub struct Command<C: ChainSpecParser> {
     #[command(subcommand)]
-    command: Subcommands<C>,
+    pub command: Subcommands<C>,
 }
 
 /// `reth stage` subcommands

crates/cli/commands/src/stage/mod.rs

@@ -220,9 +220,9 @@ impl Subcommands {
 
 #[cfg(test)]
 mod tests {
-    use reth_ethereum_cli::chainspec::EthereumChainSpecParser;
-
     use super::*;
+    use reth_chainspec::SEPOLIA;
+    use reth_ethereum_cli::chainspec::EthereumChainSpecParser;
 
     #[test]
     fn parse_unwind() {
@@ -244,4 +244,13 @@ mod tests {
         ]);
         assert_eq!(cmd.command, Subcommands::NumBlocks { amount: 100 });
     }
+
+    #[test]
+    fn parse_unwind_chain() {
+        let cmd = Command::<EthereumChainSpecParser>::parse_from([
+            "reth", "--chain", "sepolia", "to-block", "100",
+        ]);
+        assert_eq!(cmd.command, Subcommands::ToBlock { target: BlockHashOrNumber::Number(100) });
+        assert_eq!(cmd.env.chain.chain_id(), SEPOLIA.chain_id());
+    }
 }