jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(op): simplify op cli args (#8146)

Browse Source
This commit is contained in:
Emilia Hane
2024-05-08 16:37:45 +02:00
committed by GitHub
parent 331d1a0c6a
commit d852f7f012
2 changed files with 15 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
bin/reth/src/commands/import_op.rs
View File

@ -1,8 +1,9 @@
//! Command that initializes the node by importing a chain from a file.
//! Command that initializes the node by importing OP Mainnet chain segment below Bedrock, from a
//! file.
use crate::{
args::{
utils::{chain_help, genesis_value_parser, SUPPORTED_CHAINS},
utils::{genesis_value_parser, SUPPORTED_CHAINS},
DatabaseArgs,
},
commands::import::{build_import_pipeline, load_config},
@ -20,7 +21,7 @@ use reth_downloaders::file_client::{
use reth_node_core::init::init_genesis;
use reth_primitives::{hex, stage::StageId, ChainSpec, PruneModes, TxHash};
use reth_primitives::{hex, stage::StageId, PruneModes, TxHash};
use reth_provider::{ProviderFactory, StageCheckpointReader, StaticFileProviderFactory};
use reth_static_file::StaticFileProducer;
use std::{path::PathBuf, sync::Arc};
@ -44,18 +45,6 @@ pub struct ImportOpCommand {
#[arg(long, value_name = "DATA_DIR", verbatim_doc_comment, default_value_t)]
datadir: MaybePlatformPath<DataDirPath>,
/// The chain this node is running.
///
/// Possible values are either a built-in chain or the path to a chain specification file.
#[arg(
long,
value_name = "CHAIN_OR_PATH",
long_help = chain_help(),
default_value = SUPPORTED_CHAINS[0],
value_parser = genesis_value_parser
)]
chain: Arc<ChainSpec>,
/// Chunk byte length.
#[arg(long, value_name = "CHUNK_LEN", verbatim_doc_comment)]
chunk_len: Option<u64>,
@ -85,8 +74,10 @@ impl ImportOpCommand {
"Chunking chain import"
);
let chain_spec = genesis_value_parser(SUPPORTED_CHAINS[0])?;
// add network name to data dir
let data_dir = self.datadir.unwrap_or_chain_default(self.chain.chain);
let data_dir = self.datadir.unwrap_or_chain_default(chain_spec.chain);
let config_path = self.config.clone().unwrap_or_else(|| data_dir.config());
let mut config: Config = load_config(config_path.clone())?;
@ -101,15 +92,16 @@ impl ImportOpCommand {
info!(target: "reth::cli", path = ?db_path, "Opening database");
let db = Arc::new(init_db(db_path, self.db.database_args())?);
info!(target: "reth::cli", "Database opened");
let provider_factory =
ProviderFactory::new(db.clone(), self.chain.clone(), data_dir.static_files())?;
ProviderFactory::new(db.clone(), chain_spec.clone(), data_dir.static_files())?;
debug!(target: "reth::cli", chain=%self.chain.chain, genesis=?self.chain.genesis_hash(), "Initializing genesis");
debug!(target: "reth::cli", chain=%chain_spec.chain, genesis=?chain_spec.genesis_hash(), "Initializing genesis");
init_genesis(provider_factory.clone())?;
let consensus = Arc::new(EthBeaconConsensus::new(self.chain.clone()));
let consensus = Arc::new(EthBeaconConsensus::new(chain_spec.clone()));
info!(target: "reth::cli", "Consensus engine initialized");
// open file
@ -256,21 +248,3 @@ pub fn is_duplicate(tx_hash: TxHash, block_number: u64) -> bool {
}
false
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn parse_common_import_command_chain_args() {
for chain in SUPPORTED_CHAINS {
let args: ImportOpCommand =
ImportOpCommand::parse_from(["reth", "--chain", chain, "."]);
assert_eq!(
Ok(args.chain.chain),
chain.parse::<reth_primitives::Chain>(),
"failed to parse chain {chain}"
);
}
}
}

5
bin/reth/src/commands/import_receipts.rs
View File

@ -55,7 +55,10 @@ pub struct ImportReceiptsCommand {
#[command(flatten)]
db: DatabaseArgs,
/// The path to a receipts file for import.
/// The path to a receipts file for import. File must use `HackReceiptCodec` (used for
/// exporting OP chain segment below Bedrock block via testinprod/op-geth).
///
/// <https://github.com/testinprod-io/op-geth/pull/1>
#[arg(value_name = "IMPORT_PATH", verbatim_doc_comment)]
path: PathBuf,
}