From 54d76f51f90685d7eb52837f627d8ff6ad149410 Mon Sep 17 00:00:00 2001 From: PJColombo Date: Sat, 9 Mar 2024 01:26:17 +0100 Subject: [PATCH 1/2] style: rename lowest indexed slot env var --- src/env.rs | 7 ++++++- src/indexer/mod.rs | 13 +++++++------ src/main.rs | 1 + 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/env.rs b/src/env.rs index 8c611ee..adcb48c 100644 --- a/src/env.rs +++ b/src/env.rs @@ -10,7 +10,8 @@ pub struct Environment { #[serde(default = "default_execution_node_endpoint")] pub execution_node_endpoint: String, pub secret_key: String, - pub lowest_indexed_slot: Option, + #[serde(default = "default_dencun_fork_slot")] + pub dencun_fork_slot: u32, pub sentry_dsn: Option, } @@ -26,6 +27,10 @@ fn default_execution_node_endpoint() -> String { "http://localhost:8545".to_string() } +fn default_dencun_fork_slot() -> u32 { + 0 +} + impl Environment { pub fn from_env() -> Result { match envy::from_env::() { diff --git a/src/indexer/mod.rs b/src/indexer/mod.rs index 0b22bb2..613c97c 100644 --- a/src/indexer/mod.rs +++ b/src/indexer/mod.rs @@ -27,7 +27,7 @@ pub mod types; pub struct Indexer { context: Context, - lowest_indexed_slot: u32, + dencun_fork_slot: u32, num_threads: u32, slots_checkpoint: Option, } @@ -42,19 +42,20 @@ impl Indexer { return Err(error.into()); } }; + let slots_checkpoint = args.slots_per_save; let num_threads = match args.num_threads { Some(num_threads) => num_threads, None => thread::available_parallelism() .map_err(|err| anyhow!("Failed to get number of available threads: {:?}", err))? .get() as u32, }; - let lowest_indexed_slot = env.lowest_indexed_slot.unwrap_or(0); + let dencun_fork_slot = env.dencun_fork_slot; Ok(Self { context, num_threads, - slots_checkpoint: args.slots_per_save, - lowest_indexed_slot, + slots_checkpoint, + dencun_fork_slot, }) } @@ -119,11 +120,11 @@ impl Indexer { start_block_id: BlockId, ) -> JoinHandle { let mut synchronizer = self._create_synchronizer(); - let lowest_indexed_slot = self.lowest_indexed_slot; + let target_lowest_slot = self.dencun_fork_slot; tokio::spawn(async move { let result = synchronizer - .run(&start_block_id, &BlockId::Slot(lowest_indexed_slot)) + .run(&start_block_id, &BlockId::Slot(target_lowest_slot)) .await; if let Err(error) = result { diff --git a/src/main.rs b/src/main.rs index 4b966aa..d170646 100644 --- a/src/main.rs +++ b/src/main.rs @@ -47,6 +47,7 @@ pub fn print_banner(args: &Args, env: &Environment) { println!("Slot chunk size: auto"); } + println!("Dencun fork slot: {}", env.dencun_fork_slot); println!("Blobscan API endpoint: {}", env.blobscan_api_endpoint); println!( "CL endpoint: {:?}", From 12e6ac7fe6b71741ad6f58dd622a52026449c729 Mon Sep 17 00:00:00 2001 From: PJColombo Date: Sat, 9 Mar 2024 01:29:27 +0100 Subject: [PATCH 2/2] chore: improve banner by adding missing env and args vars --- src/main.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index d170646..ac83c90 100644 --- a/src/main.rs +++ b/src/main.rs @@ -35,16 +35,22 @@ pub fn print_banner(args: &Args, env: &Environment) { println!("Blobscan indexer (EIP-4844 blob indexer) - blobscan.com"); println!("======================================================="); + if let Some(from_slot) = args.from_slot.clone() { + println!("Start slot: {}", from_slot); + } else { + println!("Start slot: 0"); + } + if let Some(num_threads) = args.num_threads { println!("Number of threads: {}", num_threads); } else { - println!("Number of threads: auto"); + println!("Number of threads: 1"); } if let Some(slots_per_save) = args.slots_per_save { - println!("Slot chunk size: {}", slots_per_save); + println!("Slots checkpoint size: {}", slots_per_save); } else { - println!("Slot chunk size: auto"); + println!("Slots checkpoint size: 1000"); } println!("Dencun fork slot: {}", env.dencun_fork_slot);